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 4FA6510F16 for ; Thu, 20 Mar 2014 21:49:33 +0000 (UTC) Received: (qmail 2938 invoked by uid 500); 20 Mar 2014 21:49:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2881 invoked by uid 500); 20 Mar 2014 21:49:18 -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 2865 invoked by uid 99); 20 Mar 2014 21:49:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 21:49:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 13D15986FAB; Thu, 20 Mar 2014 21:49:18 +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: Thu, 20 Mar 2014 21:49:18 -0000 Message-Id: <7390119c75424ace9407a144253172e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/10] git commit: ACCUMULO-2512 Wait for each MAC process to exit before returning from MAC.stop() Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT bbd6aeb33 -> 0753a754b refs/heads/1.5.2-SNAPSHOT 4b7a011ca -> 63d5e55a0 refs/heads/1.6.0-SNAPSHOT aefa52e2a -> 44b13c12e refs/heads/master b644edade -> 394fe061f ACCUMULO-2512 Wait for each MAC process to exit before returning from MAC.stop() Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0753a754 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0753a754 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0753a754 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 0753a754b0a1751ab7f2bb4ddd922aa9dd492252 Parents: bbd6aeb Author: Josh Elser Authored: Thu Mar 20 16:35:04 2014 -0400 Committer: Josh Elser Committed: Thu Mar 20 16:35:04 2014 -0400 ---------------------------------------------------------------------- .../accumulo/minicluster/MiniAccumuloCluster.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0753a754/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java ---------------------------------------------------------------------- diff --git a/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java index cbed375..848e14f 100644 --- a/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java +++ b/src/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java @@ -362,22 +362,31 @@ public class MiniAccumuloCluster { */ public void stop() throws IOException, InterruptedException { - if (zooKeeperProcess != null) + if (zooKeeperProcess != null) { zooKeeperProcess.destroy(); - if (loggerProcess != null) + zooKeeperProcess.waitFor(); + } + if (loggerProcess != null) { loggerProcess.destroy(); - if (masterProcess != null) + loggerProcess.waitFor(); + } + if (masterProcess != null) { masterProcess.destroy(); + masterProcess.waitFor(); + } if (tabletServerProcesses != null) { for (Process tserver : tabletServerProcesses) { tserver.destroy(); + tserver.waitFor(); } } for (LogWriter lw : logWriters) lw.flush(); - if (gcProcess != null) + if (gcProcess != null) { gcProcess.destroy(); + gcProcess.waitFor(); + } } }