Merge pull request #4160 from xiang90/fix_lease

lease: unlock before another batch operation

lease/lessor.go

@@ -196,7 +196,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)
@@ -205,6 +204,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)
@@ -216,6 +216,8 @@ func (le *lessor) initAndRecover() {
 			expiry: minExpiry(time.Now(), time.Now().Add(time.Second*time.Duration(lpb.TTL))),
 		}
 	}
+	tx.Unlock()
+
 	le.b.ForceCommit()
 }