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 2C591103E4 for ; Thu, 5 Dec 2013 04:52:00 +0000 (UTC) Received: (qmail 31347 invoked by uid 500); 5 Dec 2013 04:51:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 31295 invoked by uid 500); 5 Dec 2013 04:51:50 -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 31241 invoked by uid 99); 5 Dec 2013 04:51:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2013 04:51:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 12F50320CD0; Thu, 5 Dec 2013 04:51:48 +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: Thu, 05 Dec 2013 04:51:48 -0000 Message-Id: <32652691e71f48a68b0e269b023d2107@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-1967 Magitator should respect presence (or lack) of a 'gc' file Updated Branches: refs/heads/1.5.1-SNAPSHOT c1fa5573c -> 0833f4fab ACCUMULO-1967 Magitator should respect presence (or lack) of a 'gc' file Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6175d7a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6175d7a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6175d7a5 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 6175d7a51838b471b96ffbdee17f4b327bf3de0e Parents: 36561a0 Author: Josh Elser Authored: Wed Dec 4 23:46:42 2013 -0500 Committer: Josh Elser Committed: Wed Dec 4 23:46:42 2013 -0500 ---------------------------------------------------------------------- test/system/continuous/magitator.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6175d7a5/test/system/continuous/magitator.pl ---------------------------------------------------------------------- diff --git a/test/system/continuous/magitator.pl b/test/system/continuous/magitator.pl index 921c4d1..a40bfb2 100755 --- a/test/system/continuous/magitator.pl +++ b/test/system/continuous/magitator.pl @@ -60,7 +60,15 @@ while(1){ $cmd = "pssh -h $ACCUMULO_CONF_DIR/masters \"pkill -f '[ ]org.apache.accumulo.start.*master'\" < /dev/null"; print "$t $cmd\n"; system($cmd); - $cmd = "pssh -h $ACCUMULO_CONF_DIR/masters \"pkill -f '[ ]org.apache.accumulo.start.*gc'\" < /dev/null"; + + $file = ''; + if (-e "$ACCUMULO_CONF_DIR/gc") { + $file = 'gc'; + } else { + $file = 'masters'; + } + + $cmd = "pssh -h $ACCUMULO_CONF_DIR/$file \"pkill -f '[ ]org.apache.accumulo.start.*gc'\" < /dev/null"; print "$t $cmd\n"; system($cmd); }