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 2014/10/21 18:38:53 UTC
[1/3] git commit: ACCUMULO-3242 Fix bug where transient exceptions
didn't sleep before retrying
Repository: accumulo
Updated Branches:
refs/heads/1.6 f84108268 -> 758a364bd
refs/heads/master 7d9373b61 -> 0b010256d
ACCUMULO-3242 Fix bug where transient exceptions didn't sleep before retrying
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/758a364b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/758a364b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/758a364b
Branch: refs/heads/1.6
Commit: 758a364bda0b47520daf251d88e0057187884d66
Parents: f841082
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 21 12:35:20 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 21 12:35:20 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/758a364b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index d72ac08..d5f7d75 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -163,9 +163,9 @@ public class ZooCache {
log.error("Looked up non-existent node in cache " + e.getPath(), e);
} else if (code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT || code == Code.SESSIONEXPIRED) {
log.warn("Saw (possibly) transient exception communicating with ZooKeeper, will retry", e);
- continue;
+ } else {
+ log.warn("Zookeeper error, will retry", e);
}
- log.warn("Zookeeper error, will retry", e);
} catch (InterruptedException e) {
log.info("Zookeeper error, will retry", e);
} catch (ConcurrentModificationException e) {
[3/3] git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b010256
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b010256
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b010256
Branch: refs/heads/master
Commit: 0b010256d299da2020146cec498739079d03223a
Parents: 7d9373b 758a364
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 21 12:38:44 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 21 12:38:44 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b010256/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3242 Fix bug where transient exceptions
didn't sleep before retrying
Posted by el...@apache.org.
ACCUMULO-3242 Fix bug where transient exceptions didn't sleep before retrying
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/758a364b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/758a364b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/758a364b
Branch: refs/heads/master
Commit: 758a364bda0b47520daf251d88e0057187884d66
Parents: f841082
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 21 12:35:20 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 21 12:35:20 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/758a364b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index d72ac08..d5f7d75 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -163,9 +163,9 @@ public class ZooCache {
log.error("Looked up non-existent node in cache " + e.getPath(), e);
} else if (code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT || code == Code.SESSIONEXPIRED) {
log.warn("Saw (possibly) transient exception communicating with ZooKeeper, will retry", e);
- continue;
+ } else {
+ log.warn("Zookeeper error, will retry", e);
}
- log.warn("Zookeeper error, will retry", e);
} catch (InterruptedException e) {
log.info("Zookeeper error, will retry", e);
} catch (ConcurrentModificationException e) {