Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58905200B79 for ; Tue, 23 Aug 2016 16:10:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5748C160AA5; Tue, 23 Aug 2016 14:10:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9CA23160AAD for ; Tue, 23 Aug 2016 16:10:48 +0200 (CEST) Received: (qmail 61432 invoked by uid 500); 23 Aug 2016 14:10:47 -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 61381 invoked by uid 99); 23 Aug 2016 14:10:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2016 14:10:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 863C7E03E8; Tue, 23 Aug 2016 14:10:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Tue, 23 Aug 2016 14:10:47 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] accumulo git commit: ACCUMULO-4163: change exception handling archived-at: Tue, 23 Aug 2016 14:10:49 -0000 Repository: accumulo Updated Branches: refs/heads/1.7 a226233d7 -> ffd50280b ACCUMULO-4163: change exception handling Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/82f17349 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/82f17349 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/82f17349 Branch: refs/heads/1.7 Commit: 82f173496b2d71b9cc586b4870169ca64f89cdd6 Parents: 7efbbd5 Author: Dave Marion Authored: Mon Aug 22 18:42:56 2016 -0400 Committer: Dave Marion Committed: Mon Aug 22 18:42:56 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/ZooZap.java | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/82f17349/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java index f9bb208..5a8f8bd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java @@ -24,6 +24,7 @@ import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.cli.ClientOpts; import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; +import org.apache.zookeeper.KeeperException; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; @@ -61,7 +62,11 @@ public class ZooZap { if (opts.zapMaster) { String masterLockPath = Constants.ZROOT + "/" + iid + Constants.ZMASTER_LOCK; - zapDirectory(zoo, masterLockPath, opts); + try { + zapDirectory(zoo, masterLockPath, opts); + } catch (Exception e) { + e.printStackTrace(); + } } if (opts.zapTservers) { @@ -89,20 +94,20 @@ public class ZooZap { if (opts.zapTracers) { String path = Constants.ZROOT + "/" + iid + Constants.ZTRACERS; - zapDirectory(zoo, path, opts); + try { + zapDirectory(zoo, path, opts); + } catch (Exception e) { + // do nothing if the /tracers node does not exist. + } } } - private static void zapDirectory(IZooReaderWriter zoo, String path, Opts opts) { - try { - List children = zoo.getChildren(path); - for (String child : children) { - message("Deleting " + path + "/" + child + " from zookeeper", opts); - zoo.recursiveDelete(path + "/" + child, NodeMissingPolicy.SKIP); - } - } catch (Exception e) { - e.printStackTrace(); + private static void zapDirectory(IZooReaderWriter zoo, String path, Opts opts) throws KeeperException, InterruptedException { + List children = zoo.getChildren(path); + for (String child : children) { + message("Deleting " + path + "/" + child + " from zookeeper", opts); + zoo.recursiveDelete(path + "/" + child, NodeMissingPolicy.SKIP); } } }