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

lease: unlock before another batch operation

Browse Source
This commit is contained in:
Xiang Li 2016-01-07 10:20:58 -08:00
parent b546f4c2c2
commit f22ea70c14
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lease/lessor.go
View File

@ -191,7 +191,6 @@ func (le *lessor) get(id LeaseID) *lease {
func (le *lessor) initAndRecover() {
tx := le.b.BatchTx()
tx.Lock()
defer tx.Unlock()
tx.UnsafeCreateBucket(leaseBucketName)
_, vs := tx.UnsafeRange(leaseBucketName, int64ToBytes(0), int64ToBytes(math.MaxInt64), 0)
@ -200,6 +199,7 @@ func (le *lessor) initAndRecover() {
var lpb leasepb.Lease
err := lpb.Unmarshal(vs[i])
if err != nil {
tx.Unlock()
panic("failed to unmarshal lease proto item")
}
id := LeaseID(lpb.ID)
@ -211,6 +211,8 @@ func (le *lessor) initAndRecover() {
expiry: minExpiry(time.Now(), time.Now().Add(time.Second*time.Duration(lpb.TTL))),
}
}
tx.Unlock()
le.b.ForceCommit()
}