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/master
Commit: 6175d7a51838b471b96ffbdee17f4b327bf3de0e
Parents: 36561a0
Author: Josh Elser <els...@apache.org>
Authored: Wed Dec 4 23:46:42 2013 -0500
Committer: Josh Elser <els...@apache.org>
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);
        }

Reply via email to