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 4BB5F1065B for ; Fri, 14 Nov 2014 01:17:05 +0000 (UTC) Received: (qmail 83052 invoked by uid 500); 14 Nov 2014 01:17:05 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 82931 invoked by uid 500); 14 Nov 2014 01:17:05 -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 82632 invoked by uid 99); 14 Nov 2014 01:17:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Nov 2014 01:17:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADD1493A66B; Fri, 14 Nov 2014 01:17:04 +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: Fri, 14 Nov 2014 01:17:12 -0000 Message-Id: <2f951abfffed499cafb83a91cb0a2f8e@git.apache.org> In-Reply-To: <15f356b3d83a4c77b8fde2788428d1e9@git.apache.org> References: <15f356b3d83a4c77b8fde2788428d1e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/12] accumulo git commit: ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4 ACCUMULO-3334 Fix arguments passed to TeraSortIngest by CloudStone4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8a6b15a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8a6b15a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8a6b15a Branch: refs/heads/1.5 Commit: a8a6b15ada23af15839820e7677432036aee2d40 Parents: e74986a Author: Josh Elser Authored: Thu Nov 13 17:11:36 2014 -0800 Committer: Josh Elser Committed: Thu Nov 13 17:11:36 2014 -0800 ---------------------------------------------------------------------- test/system/bench/lib/TeraSortBenchmark.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8a6b15a/test/system/bench/lib/TeraSortBenchmark.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/TeraSortBenchmark.py b/test/system/bench/lib/TeraSortBenchmark.py index 5f3e1b7..0b1d9f4 100755 --- a/test/system/bench/lib/TeraSortBenchmark.py +++ b/test/system/bench/lib/TeraSortBenchmark.py @@ -73,17 +73,17 @@ class TeraSortBenchmark(Benchmark): file = os.path.join( dir, 'splits' ) code, out, err = cloudshell.run(self.username, self.password, "createtable %s -sf %s\n" % (self.tablename, file)) command = self.buildcommand('org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest', - self.numrows(), - self.keysizemin(), - self.keysizemax(), - self.minvaluesize(), - self.maxvaluesize(), - self.tablename, - self.instance, - self.zookeepers, - self.username, - self.password, - self.numsplits) + '--count', self.numrows(), + '-nk', self.keysizemin(), + '-xk', self.keysizemax(), + '-nv', self.minvaluesize(), + '-xv', self.maxvaluesize(), + '-t', self.tablename, + '-i', self.instance, + '-z', self.zookeepers, + '-u', self.username, + '-p', self.password, + '--splits', self.numsplits) handle = runner.start(command, stdin=subprocess.PIPE) log.debug("Running: %r", command) out, err = handle.communicate("")