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 CABB0109FE for ; Wed, 4 Dec 2013 23:58:47 +0000 (UTC) Received: (qmail 47885 invoked by uid 500); 4 Dec 2013 23:58:46 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47787 invoked by uid 500); 4 Dec 2013 23:58:45 -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 47674 invoked by uid 99); 4 Dec 2013 23:58:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 23:58:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E54E320398; Wed, 4 Dec 2013 23:58:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 04 Dec 2013 23:59:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] ACCUMULO-1906 Remove ops on tables in a namespace http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c920943/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java index 37ad947..9fe2841 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java @@ -58,14 +58,13 @@ public class RestartIT extends ConfigurableMacIT { static { OPTS.rows = VOPTS.rows = 10 * 1000; } - + @Test(timeout = 2 * 60 * 1000) public void restartMaster() throws Exception { Connector c = getConnector(); c.tableOperations().create("test_ingest"); - Process ingest = cluster.exec(TestIngest.class, - "-u", "root", "-p", ROOT_PASSWORD, - "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "--rows", ""+OPTS.rows); + Process ingest = cluster.exec(TestIngest.class, "-u", "root", "-p", ROOT_PASSWORD, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), + "--rows", "" + OPTS.rows); for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) { cluster.killProcess(ServerType.MASTER, master); } @@ -74,7 +73,7 @@ public class RestartIT extends ConfigurableMacIT { VerifyIngest.verifyIngest(c, VOPTS, SOPTS); ingest.destroy(); } - + @Test(timeout = 8 * 60 * 1000) public void restartMasterRecovery() throws Exception { Connector c = getConnector(); @@ -99,9 +98,8 @@ public class RestartIT extends ConfigurableMacIT { Connector c = getConnector(); c.tableOperations().create("test_ingest"); c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "5K"); - Process ingest = cluster.exec(TestIngest.class, - "-u", "root", "-p", ROOT_PASSWORD, - "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "--rows", ""+VOPTS.rows); + Process ingest = cluster.exec(TestIngest.class, "-u", "root", "-p", ROOT_PASSWORD, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), + "--rows", "" + VOPTS.rows); for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) { cluster.killProcess(ServerType.MASTER, master); } @@ -110,7 +108,7 @@ public class RestartIT extends ConfigurableMacIT { VerifyIngest.verifyIngest(c, VOPTS, SOPTS); ingest.destroy(); } - + @Test(timeout = 10 * 60 * 1000) public void killedTabletServer() throws Exception { Connector c = getConnector(); @@ -150,7 +148,7 @@ public class RestartIT extends ConfigurableMacIT { assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor()); } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 10 * 60 * 1000) public void shutdownDuringCompactingSplitting() throws Exception { Connector c = getConnector(); c.tableOperations().create("test_ingest");