Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E18E17A22 for ; Wed, 6 May 2015 20:31:50 +0000 (UTC) Received: (qmail 44458 invoked by uid 500); 6 May 2015 20:31:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44375 invoked by uid 500); 6 May 2015 20:31:50 -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 44354 invoked by uid 99); 6 May 2015 20:31:50 -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; Wed, 06 May 2015 20:31:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DDDC2E0772; Wed, 6 May 2015 20:31:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Wed, 06 May 2015 20:31:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] accumulo git commit: ACCUMULO-3749 Sudo and then set ACCUMULO_CONF_DIR 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/master Commit: 4749513aed63d627c7c204fda7c336ebf1c5c3a7 Parents: 83d1b83 Author: Josh Elser Authored: Wed May 6 15:33:24 2015 -0400 Committer: Josh Elser 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 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 pair = exec(hostname, cmd); if (0 != pair.getKey()) { throw new IOException("Start " + server + " on " + hostname + " failed for execute successfully");