Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C108417CB5 for ; Tue, 21 Oct 2014 16:38:53 +0000 (UTC) Received: (qmail 42983 invoked by uid 500); 21 Oct 2014 16:38:53 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 42948 invoked by uid 500); 21 Oct 2014 16:38:53 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 42935 invoked by uid 99); 21 Oct 2014 16:38:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 16:38:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 64DD08B79DD; Tue, 21 Oct 2014 16:38:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 21 Oct 2014 16:38:54 -0000 Message-Id: In-Reply-To: <27fdc6e2a7bb4c1ea11946f04d373a78@git.apache.org> References: <27fdc6e2a7bb4c1ea11946f04d373a78@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: ACCUMULO-3242 Fix bug where transient exceptions didn't sleep before retrying 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 Authored: Tue Oct 21 12:35:20 2014 -0400 Committer: Josh Elser 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) {