gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Only mark fs as dirty vs full write on mb compaction.

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2023-10-12 12:59:19 -07:00
parent ea70590aa2
commit 0a64f18060
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/filestore.go
View File

@@ -4740,7 +4740,7 @@ func (fs *fileStore) syncBlocks() {
lmb := fs.lmb lmb := fs.lmb
fs.mu.RUnlock() fs.mu.RUnlock()
var shouldWriteState bool var markDirty bool
for _, mb := range blks { for _, mb := range blks {
// Do actual sync. Hold lock for consistency. // Do actual sync. Hold lock for consistency.
mb.mu.Lock() mb.mu.Lock()
@@ -4756,7 +4756,7 @@ func (fs *fileStore) syncBlocks() {
// Do not compact last mb. // Do not compact last mb.
if mb != lmb && mb.ensureRawBytesLoaded() == nil && mb.rbytes > mb.bytes { if mb != lmb && mb.ensureRawBytesLoaded() == nil && mb.rbytes > mb.bytes {
mb.compact() mb.compact()
shouldWriteState = true markDirty = true
} }
// Check if we need to sync. We will not hold lock during actual sync. // Check if we need to sync. We will not hold lock during actual sync.
@@ -4787,12 +4787,11 @@ func (fs *fileStore) syncBlocks() {
fs.syncTmr = time.AfterFunc(fs.fcfg.SyncInterval, fs.syncBlocks) fs.syncTmr = time.AfterFunc(fs.fcfg.SyncInterval, fs.syncBlocks)
fn := filepath.Join(fs.fcfg.StoreDir, msgDir, streamStreamStateFile) fn := filepath.Join(fs.fcfg.StoreDir, msgDir, streamStreamStateFile)
syncAlways := fs.fcfg.SyncAlways syncAlways := fs.fcfg.SyncAlways
if markDirty {
fs.dirty++
}
fs.mu.Unlock() 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. // Sync state file if we are not running with sync always.
if !syncAlways { if !syncAlways {
if fd, _ := os.OpenFile(fn, os.O_RDWR, defaultFilePerms); fd != nil { if fd, _ := os.OpenFile(fn, os.O_RDWR, defaultFilePerms); fd != nil {