ACCUMULO-2552 use volume manager to find the instance id
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67a11a8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67a11a8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67a11a8d Branch: refs/heads/master Commit: 67a11a8d90086ac39e484edf2401d1ecbafe52d6 Parents: 9550296 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Mar 26 12:48:48 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Mar 26 12:49:02 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/util/ZooKeeperMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/67a11a8d/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java index 7cac046..efcefde 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java @@ -18,9 +18,9 @@ package org.apache.accumulo.server.util; import org.apache.accumulo.core.cli.Help; import org.apache.accumulo.core.client.Instance; -import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance; +import org.apache.accumulo.server.fs.VolumeManagerImpl; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -40,7 +40,7 @@ public class ZooKeeperMain { public static void main(String[] args) throws Exception { Opts opts = new Opts(); opts.parseArgs(ZooKeeperMain.class.getName(), args); - FileSystem fs = FileSystem.get(CachedConfiguration.getInstance()); + FileSystem fs = VolumeManagerImpl.get().getDefaultVolume().getFileSystem(); String baseDir = ServerConstants.getBaseUris()[0]; System.out.println("Using " + fs.makeQualified(new Path(baseDir + "/instance_id")) + " to lookup accumulo instance"); Instance instance = HdfsZooInstance.getInstance();
