Return-Path: 
 <commits-return-13884-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
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 75F1010143
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue,  2 Dec 2014 20:36:51 +0000 (UTC)
Received: (qmail 95947 invoked by uid 500); 2 Dec 2014 20:36:51 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 95858 invoked by uid 500); 2 Dec 2014 20:36:51 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 94414 invoked by uid 99); 2 Dec 2014 20:36:50 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 20:36:50 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 1E2039BBFA0; Tue,  2 Dec 2014 20:36:50 +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: Tue, 02 Dec 2014 20:37:05 -0000
Message-Id: <1c74cdb6f31743f0b997443538fc564d@git.apache.org>
In-Reply-To: <d093177e698048639cff86d88622647f@git.apache.org>
References: <d093177e698048639cff86d88622647f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [17/50] [abbrv] accumulo git commit: ACCUMULO-3167 Wire up monitor to
 Mini cluster control for ReadWriteIT

ACCUMULO-3167 Wire up monitor to Mini cluster control for ReadWriteIT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5187012e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5187012e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5187012e

Branch: refs/heads/metrics2
Commit: 5187012e24512f9b4d2bc8c2ba75ee33386e92d8
Parents: 9bf41fd
Author: Josh Elser <elserj@apache.org>
Authored: Sat Nov 22 12:49:46 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Nov 24 18:08:51 2014 -0500

----------------------------------------------------------------------
 minicluster/pom.xml                             |  4 ++++
 .../impl/MiniAccumuloClusterControl.java        | 22 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5187012e/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 5ad531f..b7bc889 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -60,6 +60,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-monitor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-server-base</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5187012e/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index cd1a923..6e7d073 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.cluster.ClusterControl;
 import org.apache.accumulo.gc.SimpleGarbageCollector;
 import org.apache.accumulo.master.Master;
 import org.apache.accumulo.minicluster.ServerType;
+import org.apache.accumulo.monitor.Monitor;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.tserver.TabletServer;
 import org.apache.log4j.Logger;
@@ -46,6 +47,7 @@ public class MiniAccumuloClusterControl implements ClusterControl {
   Process zooKeeperProcess = null;
   Process masterProcess = null;
   Process gcProcess = null;
+  Process monitor = null;
   List<Process> tabletServerProcesses = Collections.synchronizedList(new ArrayList<Process>());
 
   public MiniAccumuloClusterControl(MiniAccumuloClusterImpl cluster) {
@@ -115,6 +117,10 @@ public class MiniAccumuloClusterControl implements ClusterControl {
           gcProcess = cluster._exec(SimpleGarbageCollector.class, server);
         }
         break;
+      case MONITOR:
+        if (null == monitor) {
+          monitor = cluster._exec(Monitor.class, server);
+        }
       // TODO Enabled Monitor and Tracer for proper mini-ness
       default:
         throw new UnsupportedOperationException("Cannot start process for " + server);
@@ -197,7 +203,21 @@ public class MiniAccumuloClusterControl implements ClusterControl {
               tabletServerProcesses.clear();
             }
           }
-
+        }
+        break;
+      case MONITOR:
+        if (monitor != null) {
+          try {
+            cluster.stopProcessWithTimeout(monitor, 30, TimeUnit.SECONDS);
+          } catch (ExecutionException e) {
+            log.warn("Monitor did not fully stop after 30 seconds", e);
+          } catch (TimeoutException e) {
+            log.warn("Monitor did not fully stop after 30 seconds", e);
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+          } finally {
+            monitor = null;
+          }
         }
         break;
       default: