You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/01/23 23:26:58 UTC
[12/12] accumulo git commit: Merge branch '1.6'
Merge branch '1.6'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b2045e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b2045e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b2045e7
Branch: refs/heads/master
Commit: 4b2045e7d36bb580abe66346e9ad79e62f63b23e
Parents: 3db1609 69ca8c9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jan 23 17:25:45 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jan 23 17:25:45 2015 -0500
----------------------------------------------------------------------
.../accumulo/core/file/rfile/SplitLarge.java | 3 +--
.../org/apache/accumulo/server/util/ZooZap.java | 18 ++++++-------
.../apache/accumulo/master/util/FateAdmin.java | 28 +++++++++++++-------
3 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b2045e7/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 759d898,f9bb208..090c85b
--- 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
@@@ -35,12 -29,9 +35,10 @@@ import com.beust.jcommander.JCommander
import com.beust.jcommander.Parameter;
public class ZooZap {
+ private static final Logger log = Logger.getLogger(ZooZap.class);
- static boolean verbose = false;
-
- private static void message(String msg) {
- if (verbose)
+ private static void message(String msg, Opts opts) {
+ if (opts.verbose)
System.out.println(msg);
}
@@@ -107,8 -88,8 +105,8 @@@
}
if (opts.zapTracers) {
- String path = Constants.ZROOT + "/" + iid + Constants.ZTRACERS;
+ String path = opts.getTraceZKPath();
- zapDirectory(zoo, path);
+ zapDirectory(zoo, path, opts);
}
}