Fixed the problem of updating lock data to perform rewrite operation …

…by immediately expiring Lock command.
snower · Apr 21, 2024 · 7c85e92 · 7c85e92
1 parent bf7409b
commit 7c85e92
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/server/db.go b/server/db.go
@@ -2326,11 +2326,6 @@ func (self *LockDB) HasLock(command *protocol.LockCommand, aofLockData []byte) b
 		lockManager.glock.Unlock()
 		return false
 	}
-	currentLock := lockManager.GetLockedLock(command)
-	if currentLock == nil {
-		lockManager.glock.Unlock()
-		return false
-	}
 	if command.ExpriedFlag&0x4440 == 0 && command.Expried == 0 {
 		if aofLockData == nil || lockManager.currentData == nil || lockManager.currentData.data == nil || len(aofLockData) != len(lockManager.currentData.data) {
 			lockManager.glock.Unlock()
@@ -2343,6 +2338,13 @@ func (self *LockDB) HasLock(command *protocol.LockCommand, aofLockData []byte) b
 				return false
 			}
 		}
+		lockManager.glock.Unlock()
+		return true
+	}
+	currentLock := lockManager.GetLockedLock(command)
+	if currentLock == nil {
+		lockManager.glock.Unlock()
+		return false
 	}
 	lockManager.glock.Unlock()
 	return true