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 EA0D1109CB for ; Wed, 26 Nov 2014 04:23:20 +0000 (UTC) Received: (qmail 41723 invoked by uid 500); 26 Nov 2014 04:23:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 41615 invoked by uid 500); 26 Nov 2014 04:23:20 -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 40017 invoked by uid 99); 26 Nov 2014 04:23: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; Wed, 26 Nov 2014 04:23:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EAC0632A48F; Wed, 26 Nov 2014 04:23:17 +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, 26 Nov 2014 04:23:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/50] [abbrv] accumulo git commit: ACCUMULO-3167 Remove a pointless stopAll ACCUMULO-3167 Remove a pointless stopAll Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5cb8420 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5cb8420 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5cb8420 Branch: refs/heads/1.6 Commit: e5cb84204b2e3e84a8406f52fc321867815892db Parents: 8f09ea1 Author: Josh Elser Authored: Sun Nov 23 19:42:53 2014 -0500 Committer: Josh Elser Committed: Mon Nov 24 18:08:52 2014 -0500 ---------------------------------------------------------------------- .../test/functional/WriteAheadLogIT.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5cb8420/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java index 261deb3..07218ad 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java @@ -59,18 +59,13 @@ public class WriteAheadLogIT extends AccumuloClusterIT { c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "750K"); TestIngest.Opts opts = new TestIngest.Opts(); opts.tableName = tableName; - try { - TestIngest.ingest(c, opts, new BatchWriterOpts()); - VerifyIngest.Opts vopts = new VerifyIngest.Opts(); - vopts.tableName = tableName; - VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); - getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER); - getCluster().getClusterControl().startAllServers(ServerType.TABLET_SERVER); - VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); - getCluster().getClusterControl().adminStopAll(); - } finally { - getCluster().start(); - } + TestIngest.ingest(c, opts, new BatchWriterOpts()); + VerifyIngest.Opts vopts = new VerifyIngest.Opts(); + vopts.tableName = tableName; + VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); + getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER); + getCluster().getClusterControl().startAllServers(ServerType.TABLET_SERVER); + VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); } }