accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: ACCUMULO-2803 Agitator: Independent Tablet Server and Datanode Min/Max Kill Values
Date Sat, 07 Jun 2014 14:12:46 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT 4950870de -> e7e050a6b


ACCUMULO-2803 Agitator: Independent Tablet Server and Datanode Min/Max Kill Values


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c839e2ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c839e2ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c839e2ff

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: c839e2ff7491685be07c3ffff461f9b5ead347ba
Parents: affb974
Author: Drew Farris <drew@apache.org>
Authored: Fri Jun 6 18:17:13 2014 -0700
Committer: Drew Farris <drew@apache.org>
Committed: Fri Jun 6 18:17:13 2014 -0700

----------------------------------------------------------------------
 .../system/continuous/continuous-env.sh.example | 30 ++++++++++++++------
 test/system/continuous/start-agitator.sh        | 12 ++++----
 2 files changed, 27 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c839e2ff/test/system/continuous/continuous-env.sh.example
----------------------------------------------------------------------
diff --git a/test/system/continuous/continuous-env.sh.example b/test/system/continuous/continuous-env.sh.example
index bf4e99e..d3fdd62 100644
--- a/test/system/continuous/continuous-env.sh.example
+++ b/test/system/continuous/continuous-env.sh.example
@@ -74,18 +74,30 @@ SLEEP_TIME=10
 #set auths.
 AUTHS=''
 
-#time amount of time (in minutes) the agitator should sleep before killing
-KILL_SLEEP_TIME=20
-
-#time amount of time (in minutes) the agitator should sleep after killing before running
tup 
-TUP_SLEEP_TIME=10
-
 #determines if checksum are generated, may want to turn of when performance testing
 CHECKSUM=true
 
-#the minimum and maximum server the agitator will kill at once
-MIN_KILL=1
-MAX_KILL=1
+#the amount of time (in minutes) the agitator should sleep before killing tservers
+TSERVER_KILL_SLEEP_TIME=20
+
+#the amount of time (in minutes) the agitator should sleep after killing
+# before restarting tservers
+TSERVER_RESTART_SLEEP_TIME=10
+
+#the minimum and maximum number of tservers the agitator will kill at once
+TSERVER_MIN_KILL=1
+TSERVER_MAX_KILL=1
+
+#the amount of time (in minutes) the agitator should sleep before killing datanodes
+DATANODE_KILL_SLEEP_TIME=20
+
+#the amount of time (in minutes) the agitator should sleep after killing
+# before restarting datanodes
+DATANODE_RESTART_SLEEP_TIME=10
+
+#the minimum and maximum number of datanodes the agitator will kill at once
+DATANODE_MIN_KILL=1
+DATANODE_MAX_KILL=1
 
 #time in minutes between killing masters
 MASTER_KILL_SLEEP_TIME=60

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c839e2ff/test/system/continuous/start-agitator.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-agitator.sh b/test/system/continuous/start-agitator.sh
index 70d5c53..e82e5ab 100755
--- a/test/system/continuous/start-agitator.sh
+++ b/test/system/continuous/start-agitator.sh
@@ -40,18 +40,18 @@ if [[ "`whoami`" == "root" ]];  then
   # Change to the correct user if started as root
   su -c "nohup ${bin}/master-agitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME
>${LOG_BASE}_master-agitator.out 2>${LOG_BASE}_master-agitator.err &" -m - $ACCUMULO_USER
 
-  su -c "nohup ${bin}/tserver-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $MIN_KILL $MAX_KILL
>${LOG_BASE}_tserver-agitator.out 2>${LOG_BASE}_tserver-agitator.err &" -m - $ACCUMULO_USER
+  su -c "nohup ${bin}/tserver-agitator.pl $TSERVER_KILL_SLEEP_TIME $TSERVER_RESTART_SLEEP_TIME
$TSERVER_MIN_KILL $TSERVER_MAX_KILL >${LOG_BASE}_tserver-agitator.out 2>${LOG_BASE}_tserver-agitator.err
&" -m - $ACCUMULO_USER
 
-  su -c "nohup ${bin}/datanode-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $HADOOP_PREFIX
$MIN_KILL $MAX_KILL >${LOG_BASE}_datanode-agitator.out 2>${LOG_BASE}_datanode-agitator.err
&" -m - $HDFS_USER
+  su -c "nohup ${bin}/datanode-agitator.pl $DATANODE_KILL_SLEEP_TIME $DATANODE_RESTART_SLEEP_TIME
$HADOOP_PREFIX $DATANODE_MIN_KILL $DATANODE_MAX_KILL >${LOG_BASE}_datanode-agitator.out
2>${LOG_BASE}_datanode-agitator.err &" -m - $HDFS_USER
 
 elif [[ "`whoami`" == $ACCUMULO_USER ]]; then
   echo "Running master-agitator and tserver-agitator as `whoami`. Running datanode-agitator
as $HDFS_USER using sudo."
   # Just run the master-agitator if we're the accumulo user
   nohup ${bin}/master-agitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME >${LOG_BASE}_master-agitator.out
2>${LOG_BASE}_master-agitator.err &
 
-  nohup ${bin}/tserver-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $MIN_KILL $MAX_KILL >${LOG_BASE}_tserver-agitator.out
2>${LOG_BASE}_tserver-agitator.err &
+  nohup ${bin}/tserver-agitator.pl $TSERVER_KILL_SLEEP_TIME $TSERVER_RESTART_SLEEP_TIME $TSERVER_MIN_KILL
$TSERVER_MAX_KILL >${LOG_BASE}_tserver-agitator.out 2>${LOG_BASE}_tserver-agitator.err
&
 
-  sudo -u $HDFS_USER nohup ${bin}/datanode-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $HADOOP_PREFIX
$MIN_KILL $MAX_KILL >${LOG_BASE}_datanode-agitator.out 2>${LOG_BASE}_datanode-agitator.err
&
+  sudo -u $HDFS_USER nohup ${bin}/datanode-agitator.pl $DATANODE_KILL_SLEEP_TIME $DATANODE_RESTART_SLEEP_TIME
$HADOOP_PREFIX $DATANODE_MIN_KILL $DATANODE_MAX_KILL >${LOG_BASE}_datanode-agitator.out
2>${LOG_BASE}_datanode-agitator.err &
 
 else
   echo "Running master-agitator and tserver-agitator as $ACCUMULO_USER using sudo. Running
datanode-agitator as $HDFS_USER using sudo."
@@ -59,9 +59,9 @@ else
   # Not root, and not the accumulo user, hope you can sudo to it
   sudo -u $ACCUMULO_USER "nohup ${bin}/master-agitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME
>${LOG_BASE}_master-agitator.out 2>${LOG_BASE}_master-agitator.err &"
 
-  sudo -u $ACCUMULO_USER "nohup ${bin}/tserver-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME
$MIN_KILL $MAX_KILL >${LOG_BASE}_tserver-agitator.out 2>${LOG_BASE}_tserver-agitator.err
&"
+  sudo -u $ACCUMULO_USER "nohup ${bin}/tserver-agitator.pl $TSERVER_KILL_SLEEP_TIME $TSERVER_RESTART_SLEEP_TIME
$TSERVER_MIN_KILL $TSERVER_MAX_KILL >${LOG_BASE}_tserver-agitator.out 2>${LOG_BASE}_tserver-agitator.err
&"
 
-  sudo -u $HDFS_USER "nohup ${bin}/datanode-agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME
$HADOOP_PREFIX $MIN_KILL $MAX_KILL >${LOG_BASE}_datanode-agitator.out 2>${LOG_BASE}_datanode-agitator.err
&" -m - $HDFS_USER
+  sudo -u $HDFS_USER "nohup ${bin}/datanode-agitator.pl $DATANODE_KILL_SLEEP_TIME $DATANODE_RESTART_SLEEP_TIME
$HADOOP_PREFIX $DATANODE_MIN_KILL $DATANODE_MAX_KILL >${LOG_BASE}_datanode-agitator.out
2>${LOG_BASE}_datanode-agitator.err &" -m - $HDFS_USER
 
 fi
 


Mime
View raw message