accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [2/4] accumulo git commit: Merge branch '1.6' into 1.7
Date Tue, 23 Aug 2016 14:11:26 GMT
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffd50280
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffd50280
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffd50280

Branch: refs/heads/master
Commit: ffd50280b12139ab15b3f2d68018c21f30575209
Parents: a226233 82f1734
Author: Dave Marion <dlmarion@apache.org>
Authored: Tue Aug 23 09:56:35 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Tue Aug 23 09:56:35 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/ffd50280/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index f3a9bdc,5a8f8bd..296f7b6
--- 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
@@@ -26,11 -22,9 +26,12 @@@ import org.apache.accumulo.core.conf.Si
  import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
  import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
  import org.apache.accumulo.server.cli.ClientOpts;
 +import org.apache.accumulo.server.security.SecurityUtil;
  import org.apache.accumulo.server.zookeeper.ZooLock;
  import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
+ import org.apache.zookeeper.KeeperException;
  
  import com.beust.jcommander.JCommander;
  import com.beust.jcommander.Parameter;
@@@ -106,8 -93,12 +111,12 @@@ public class ZooZap 
      }
  
      if (opts.zapTracers) {
 -      String path = Constants.ZROOT + "/" + iid + Constants.ZTRACERS;
 +      String path = opts.getTraceZKPath();
-       zapDirectory(zoo, path, opts);
+       try {
+         zapDirectory(zoo, path, opts);
+       } catch (Exception e) {
+         // do nothing if the /tracers node does not exist.
+       }
      }
  
    }


Mime
View raw message