Repository: accumulo Updated Branches: refs/heads/1.7 83d1b8388 -> 2938cfad9 refs/heads/master 8cbaa0576 -> 46f76023b
ACCUMULO-3749 Sudo and then set ACCUMULO_CONF_DIR Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4749513a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4749513a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4749513a Branch: refs/heads/1.7 Commit: 4749513aed63d627c7c204fda7c336ebf1c5c3a7 Parents: 83d1b83 Author: Josh Elser <els...@apache.org> Authored: Wed May 6 15:33:24 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 6 15:33:24 2015 -0400 ---------------------------------------------------------------------- .../accumulo/cluster/standalone/StandaloneClusterControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4749513a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java index 8779878..89027e7 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java @@ -140,7 +140,7 @@ public class StandaloneClusterControl implements ClusterControl { public void adminStopAll() throws IOException { File confDir = getConfDir(); String master = getHosts(new File(confDir, "masters")).get(0); - String[] cmd = new String[] {ACCUMULO_CONF_DIR + accumuloConfDir, SUDO_CMD, "-u", user, accumuloPath, Admin.class.getName(), "stopAll"}; + String[] cmd = new String[] {SUDO_CMD, "-u", user, ACCUMULO_CONF_DIR + accumuloConfDir, accumuloPath, Admin.class.getName(), "stopAll"}; Entry<Integer,String> pair = exec(master, cmd); if (0 != pair.getKey().intValue()) { throw new IOException("stopAll did not finish successfully, retcode=" + pair.getKey() + ", stdout=" + pair.getValue()); @@ -193,7 +193,7 @@ public class StandaloneClusterControl implements ClusterControl { @Override public void start(ServerType server, String hostname) throws IOException { - String[] cmd = new String[] {ACCUMULO_CONF_DIR + accumuloConfDir, SUDO_CMD, "-u", user, startServerPath, hostname, getProcessString(server)}; + String[] cmd = new String[] {SUDO_CMD, "-u", user, ACCUMULO_CONF_DIR + accumuloConfDir, startServerPath, hostname, getProcessString(server)}; Entry<Integer,String> pair = exec(hostname, cmd); if (0 != pair.getKey()) { throw new IOException("Start " + server + " on " + hostname + " failed for execute successfully");
