Return-Path: 
 <commits-return-14680-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 5F20F109B9
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 19 Feb 2015 18:27:26 +0000 (UTC)
Received: (qmail 43025 invoked by uid 500); 19 Feb 2015 18:27:21 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 42925 invoked by uid 500); 19 Feb 2015 18:27:21 -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 42909 invoked by uid 99); 19 Feb 2015 18:27:21 -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; Thu, 19 Feb 2015 18:27:21 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 14776E042E; Thu, 19 Feb 2015 18:27:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ecn@apache.org
To: commits@accumulo.apache.org
Date: Thu, 19 Feb 2015 18:27:21 -0000
Message-Id: <1672d0e3b980419a9a9d71a2269a5a8d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] accumulo git commit: ACCUMULO-3603 port back to 1.6

Repository: accumulo
Updated Branches:
  refs/heads/master dedede9a3 -> a20484c25


ACCUMULO-3603 port back to 1.6


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

Branch: refs/heads/master
Commit: c3a76f6cc342bca38e415176628e3b3599db8113
Parents: 320f3f7
Author: Eric Newton <Eric Newton>
Authored: Thu Feb 19 13:16:22 2015 -0500
Committer: Eric Newton <Eric Newton>
Committed: Thu Feb 19 13:16:22 2015 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/MultiTableRecoveryIT.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3a76f6c/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
index 8a13918..dcb7bae 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
@@ -35,6 +35,7 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.accumulo.minicluster.impl.ProcessReference;
 import org.apache.accumulo.test.functional.ConfigurableMacIT;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.RawLocalFileSystem;
@@ -71,14 +72,14 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
     agitator.start();
     System.out.println("writing");
     final Random random = new Random();
-    for (i = 0; i < 1_000_000; i++) {
+    for (i = 0; i < 1000 * 1000; i++) {
       long randomRow = Math.abs(random.nextLong());
       assertTrue(randomRow >= 0);
       final int table = (int) (randomRow % N);
       final Mutation m = new Mutation(Long.toHexString(randomRow));
       m.put(new byte[0], new byte[0], values[table]);
       writers[table].addMutation(m);
-      if ((i % 10_000) == 0) {
+      if ((i % 10 * 1000) == 0) {
         System.out.println("flushing");
         for (int w = 0; w < N; w++) {
           writers[w].flush();
@@ -103,7 +104,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
       }
       scanner.close();
     }
-    assertEquals(1_000_000, count);
+    assertEquals(1000 * 1000, count);
   }
 
   private Thread agitator(final AtomicBoolean stop) {
@@ -115,7 +116,9 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
           while (!stop.get()) {
             UtilWaitThread.sleep(10 * 1000);
             System.out.println("Restarting");
-            getCluster().getClusterControl().stop(ServerType.TABLET_SERVER);
+            for (ProcessReference proc : getCluster().getProcesses().get(ServerType.TABLET_SERVER)) {
+              getCluster().killProcess(ServerType.TABLET_SERVER, proc);
+            }
             getCluster().start();
             // read the metadata table to know everything is back up
             for (@SuppressWarnings("unused")