Merge pull request #812 from DanielNi/master

Zookeeper: Set the correct lock state when releasing because of ZK disconnect
rax-maas · Jun 1, 2017 · 6064bfc · 6064bfc
2 parents 358242e + ba75bb3
commit 6064bfc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ZKShardLockManager.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ZKShardLockManager.java
@@ -627,7 +627,7 @@ boolean canWork() {
          * Triggered during the connection loss. Release the lease, and clear the mutex.
          */
         void connectionLost() {
-            release(false);
+            release(true);
         }
 
         synchronized void setState(LockState newState) {
@@ -737,7 +737,7 @@ public Boolean call() throws Exception {
                             return false;
                         } finally {
                             lockTaskCount.decrementAndGet();
-                            if (!disconnected) {
+                            if (disconnected) {
                                 setState(LockState.ERROR);
                             } else {
                                 setState(LockState.DISINTERESTED);