vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mvcc: Log warning when compaction encounters error (#11447)

release-3.5
Ted Yu 2019-12-13 15:59:49 -08:00 committed by Xiang Li
parent 378b05b8dd
commit 7f3dd59d22
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mvcc/kvstore.go
View File

@ -46,7 +46,6 @@ var (
ErrCompacted = errors.New("mvcc: required revision has been compacted")
ErrFutureRev = errors.New("mvcc: required revision is a future revision")
ErrCanceled = errors.New("mvcc: watcher is canceled")
ErrClosed = errors.New("mvcc: closed")
plog = capnslog.NewPackageLogger("go.etcd.io/etcd", "mvcc")
)
@ -445,7 +444,9 @@ func (s *store) restore() error {
tx.Unlock()
if scheduledCompact != 0 {
s.compactLockfree(scheduledCompact)
if _, err := s.compactLockfree(scheduledCompact); err != nil {
plog.Warningf("compaction encountered: %v", err)
}
if s.lg != nil {
s.lg.Info(
@ -499,7 +500,9 @@ func restoreIntoIndex(lg *zap.Logger, idx index) (chan<- revKeyValue, <-chan int
currentRev = rev.main
if ok {
if isTombstone(rkv.key) {
ki.tombstone(lg, rev.main, rev.sub)
if err := ki.tombstone(lg, rev.main, rev.sub); err != nil {
plog.Warningf("tombstone encountered: %v", err)
}
continue
}
ki.put(lg, rev.main, rev.sub)