ACCUMULO-1572 ignore connection lost; eventually we'll get an session lost event
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/333062d2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/333062d2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/333062d2 Branch: refs/heads/master Commit: 333062d27e25ee227365357bdca237b0c6912f68 Parents: cd8ebfe Author: Eric Newton <[email protected]> Authored: Wed Jul 17 14:03:39 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Wed Jul 17 14:03:39 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/zookeeper/ZooLock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/333062d2/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java b/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java index 277dad5..03e84a7 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java +++ b/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java @@ -230,7 +230,7 @@ public class ZooLock implements Watcher { lostLock(LockLossReason.LOCK_DELETED); } else if (asyncLock != null && event.getType() == EventType.NodeDeleted && event.getPath().equals(path + "/" + asyncLock)) { failedToAcquireLock(); - } else if (event.getState() != KeeperState.Expired && (lock != null || asyncLock != null)) { + } else if (event.getState() != KeeperState.Disconnected && event.getState() != KeeperState.Expired && (lock != null || asyncLock != null)) { log.debug("Unexpected event watching lock node "+event+" "+asyncLockPath); try { Stat stat2 = zooKeeper.getStatus(asyncLockPath, this);
