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

mvcc: use correct error variable in defragdb (#11527) 

Co-authored-by: yutedz <54038175+yutedz@users.noreply.github.com>
release-3.5
Ted Yu 2020-01-22 11:03:23 -08:00 committed by Xiang Li
parent d17a607da2
commit c3497c84ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mvcc/backend/backend.go
View File

@ -498,7 +498,7 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
} }
tmpb.FillPercent = 0.9 // for seq write in for each tmpb.FillPercent = 0.9 // for seq write in for each
if pErr := b.ForEach(func(k, v []byte) error { if err = b.ForEach(func(k, v []byte) error {
count++ count++
if count > limit { if count > limit {
err = tmptx.Commit() err = tmptx.Commit()
@ -515,8 +515,8 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
count = 0 count = 0
} }
return tmpb.Put(k, v) return tmpb.Put(k, v)
}); pErr != nil { }); err != nil {
return pErr return err
} }
} }