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

backedn: protect backend access with lock

Browse Source
This commit is contained in:
Xiang Li 2016-04-21 08:48:33 -07:00
parent 4991cda202
commit c0cf44f134
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
storage/backend/backend.go
View File

@ -201,6 +201,18 @@ func (b *backend) Commits() int64 {
}
func (b *backend) Defrag() error {
err := b.defrag()
if err != nil {
return err
}
// commit to update metadata like db.size
b.batchTx.Commit()
return nil
}
func (b *backend) defrag() error {
// TODO: make this non-blocking?
// lock batchTx to ensure nobody is using previous tx, and then
// close previous ongoing tx.
@ -251,8 +263,6 @@ func (b *backend) Defrag() error {
if err != nil {
log.Fatalf("backend: cannot begin tx (%s)", err)
}
// commit to update metadata like db.size
b.batchTx.commit(false)
return nil
}

2
storage/backend/batch_tx.go
View File

@ -160,6 +160,8 @@ func (t *batchTx) commit(stop bool) {
// commit the last tx
if t.tx != nil {
if t.pending == 0 && !stop {
t.backend.mu.RLock()
defer t.backend.mu.RUnlock()
atomic.StoreInt64(&t.backend.size, t.tx.Size())
return
}