mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4160 from xiang90/fix_lease

Browse Source 
lease: unlock before another batch operation
This commit is contained in:
Xiang Li
2016-01-07 11:20:31 -08:00
parent 8774d53459 f22ea70c14
commit 6f39608624
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lease/lessor.go
View File

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