Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIXED] Only mark fs as dirty vs full write on mb compaction. #4657

Merged
merged 1 commit into from Oct 12, 2023
Merged

[FIXED] Only mark fs as dirty vs full write on mb compaction. #4657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions server/filestore.go
View file
Open in desktop
Expand Up @@ -4740,7 +4740,7 @@ func (fs *fileStore) syncBlocks() {
lmb := fs.lmb
fs.mu.RUnlock()

var shouldWriteState bool
var markDirty bool
for _, mb := range blks {
// Do actual sync. Hold lock for consistency.
mb.mu.Lock()
Expand All @@ -4756,7 +4756,7 @@ func (fs *fileStore) syncBlocks() {
// Do not compact last mb.
if mb != lmb && mb.ensureRawBytesLoaded() == nil && mb.rbytes > mb.bytes {
mb.compact()
shouldWriteState = true
markDirty = true
}

// Check if we need to sync. We will not hold lock during actual sync.
Expand Down Expand Up @@ -4787,12 +4787,11 @@ func (fs *fileStore) syncBlocks() {
fs.syncTmr = time.AfterFunc(fs.fcfg.SyncInterval, fs.syncBlocks)
fn := filepath.Join(fs.fcfg.StoreDir, msgDir, streamStreamStateFile)
syncAlways := fs.fcfg.SyncAlways
if markDirty {
fs.dirty++
}
fs.mu.Unlock()

// Check if we should write out our state due to compaction of one or more msg blocks.
if shouldWriteState {
fs.writeFullState()
}
// Sync state file if we are not running with sync always.
if !syncAlways {
if fd, _ := os.OpenFile(fn, os.O_RDWR, defaultFilePerms); fd != nil {
Expand Down