Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17792 from ahrtr/update_compact_log_bootstrap_20240415

Browse Source 
Update the compaction log when bootstrap and update compact's signature
This commit is contained in:
Benjamin Wang 2024-04-21 13:09:12 +01:00 committed by GitHub
commit 6cbaa1f441
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/storage/mvcc/kvstore.go
View File

@ -226,7 +226,7 @@ func (s *store) checkPrevCompactionCompleted() bool {
return scheduledCompact == finishedCompact && scheduledCompactFound == finishedCompactFound return scheduledCompact == finishedCompact && scheduledCompactFound == finishedCompactFound
} }
func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevCompactionCompleted bool) (<-chan struct{}, error) { func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevCompactionCompleted bool) <-chan struct{} {
ch := make(chan struct{}) ch := make(chan struct{})
j := schedule.NewJob("kvstore_compact", func(ctx context.Context) { j := schedule.NewJob("kvstore_compact", func(ctx context.Context) {
if ctx.Err() != nil { if ctx.Err() != nil {
@ -251,7 +251,7 @@ func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevC
s.fifoSched.Schedule(j) s.fifoSched.Schedule(j)
trace.Step("schedule compaction") trace.Step("schedule compaction")
return ch, nil return ch
} }
func (s *store) compactLockfree(rev int64) (<-chan struct{}, error) { func (s *store) compactLockfree(rev int64) (<-chan struct{}, error) {
@ -261,7 +261,7 @@ func (s *store) compactLockfree(rev int64) (<-chan struct{}, error) {
return ch, err return ch, err
} }
return s.compact(traceutil.TODO(), rev, prevCompactRev, prevCompactionCompleted) return s.compact(traceutil.TODO(), rev, prevCompactRev, prevCompactionCompleted), nil
} }
func (s *store) Compact(trace *traceutil.Trace, rev int64) (<-chan struct{}, error) { func (s *store) Compact(trace *traceutil.Trace, rev int64) (<-chan struct{}, error) {
@ -275,7 +275,7 @@ func (s *store) Compact(trace *traceutil.Trace, rev int64) (<-chan struct{}, err
} }
s.mu.Unlock() s.mu.Unlock()
return s.compact(trace, rev, prevCompactRev, prevCompactionCompleted) return s.compact(trace, rev, prevCompactRev, prevCompactionCompleted), nil
} }
func (s *store) Commit() { func (s *store) Commit() {
@ -394,13 +394,16 @@ func (s *store) restore() error {
if scheduledCompact != 0 { if scheduledCompact != 0 {
if _, err := s.compactLockfree(scheduledCompact); err != nil { if _, err := s.compactLockfree(scheduledCompact); err != nil {
s.lg.Warn("compaction encountered error", zap.Error(err)) s.lg.Warn("compaction encountered error",
zap.Int64("scheduled-compact-revision", scheduledCompact),
zap.Error(err),
)
} else {
s.lg.Info(
"resume scheduled compaction",
zap.Int64("scheduled-compact-revision", scheduledCompact),
)
} }
s.lg.Info(
"resume scheduled compaction",
zap.Int64("scheduled-compact-revision", scheduledCompact),
)
} }
return nil return nil