You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/07/31 04:00:01 UTC
[41/50] [abbrv] git commit: ACCUMULO-1572 ignore connection lost;
eventually we'll get an session lost event
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/1.5.1-SNAPSHOT
Commit: 333062d27e25ee227365357bdca237b0c6912f68
Parents: cd8ebfe
Author: Eric Newton <er...@gmail.com>
Authored: Wed Jul 17 14:03:39 2013 -0400
Committer: Eric Newton <er...@gmail.com>
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);