You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/11/26 23:07:26 UTC
[1/4] git commit: ACCUMULO-1932 Make the agitator a little more
robust,
not relying on start-dfs.sh to minimize the amount of chatter across the
network to only restart one datanode.
Updated Branches:
refs/heads/master c3befc23d -> eaa2f28d2
ACCUMULO-1932 Make the agitator a little more robust, not relying on start-dfs.sh to minimize the amount of chatter
across the network to only restart one datanode.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4637dd74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4637dd74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4637dd74
Branch: refs/heads/master
Commit: 4637dd74540087d45403465d752afcdeb5a7bdf7
Parents: 374f46f
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 16:55:47 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 16:55:47 2013 -0500
----------------------------------------------------------------------
test/system/continuous/agitator.pl | 155 +++++++++++++++++---------------
1 file changed, 83 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4637dd74/test/system/continuous/agitator.pl
----------------------------------------------------------------------
diff --git a/test/system/continuous/agitator.pl b/test/system/continuous/agitator.pl
index c779983..f1abcd5 100755
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@ -17,129 +17,140 @@
use POSIX qw(strftime);
+use Cwd qw();
if(scalar(@ARGV) != 4 && scalar(@ARGV) != 2){
- print "Usage : agitator.pl <min sleep before kill in minutes>[:max sleep before kill in minutes] <min sleep before tup in minutes>[:max sleep before tup in minutes] [<min kill> <max kill>]\n";
- exit(1);
+ print "Usage : agitator.pl <min sleep before kill in minutes>[:max sleep before kill in minutes] <min sleep before tup in minutes>[:max sleep before tup in minutes] [<min kill> <max kill>]\n";
+ exit(1);
}
-$ACCUMULO_HOME="../../..";
+$ACCUMULO_USER='accumulo';
+$HDFS_USER='hdfs';
+
+$cwd=Cwd::cwd();
+$ACCUMULO_HOME=$cwd . '/../../..';
$HADOOP_PREFIX=$ENV{"HADOOP_PREFIX"};
+print STDERR "Current directory: $cwd\n";
+print STDERR "ACCUMULO_HOME=$ACCUMULO_HOME\n";
+print STDERR "HADOOP_PREFIX=$HADOOP_PREFIX\n";
+
@sleeprange1 = split(/:/, $ARGV[0]);
$sleep1 = $sleeprange1[0];
@sleeprange2 = split(/:/, $ARGV[1]);
$sleep2 = $sleeprange2[0];
-if(scalar(@sleeprange1) > 1){
- $sleep1max = $sleeprange1[1] + 1;
-}else{
- $sleep1max = $sleep1;
+if (scalar(@sleeprange1) > 1) {
+ $sleep1max = $sleeprange1[1] + 1;
+} else {
+ $sleep1max = $sleep1;
}
-if($sleep1 > $sleep1max){
- die("sleep1 > sleep1max $sleep1 > $sleep1max");
+if ($sleep1 > $sleep1max) {
+ die("sleep1 > sleep1max $sleep1 > $sleep1max");
}
-if(scalar(@sleeprange2) > 1){
- $sleep2max = $sleeprange2[1] + 1;
-}else{
- $sleep2max = $sleep2;
+if (scalar(@sleeprange2) > 1) {
+ $sleep2max = $sleeprange2[1] + 1;
+} else {
+ $sleep2max = $sleep2;
}
if($sleep2 > $sleep2max){
- die("sleep2 > sleep2max $sleep2 > $sleep2max");
+ die("sleep2 > sleep2max $sleep2 > $sleep2max");
}
if(defined $ENV{'ACCUMULO_CONF_DIR'}){
$ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
}else{
- $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+ $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
}
if(scalar(@ARGV) == 4){
- $minKill = $ARGV[2];
- $maxKill = $ARGV[3];
+ $minKill = $ARGV[2];
+ $maxKill = $ARGV[3];
}else{
- $minKill = 1;
- $maxKill = 1;
+ $minKill = 1;
+ $maxKill = 1;
}
if($minKill > $maxKill){
- die("minKill > maxKill $minKill > $maxKill");
+ die("minKill > maxKill $minKill > $maxKill");
}
@slavesRaw = `cat $ACCUMULO_CONF_DIR/slaves`;
chomp(@slavesRaw);
for $slave (@slavesRaw){
- if($slave eq "" || substr($slave,0,1) eq "#"){
- next;
- }
+ if($slave eq "" || substr($slave,0,1) eq "#"){
+ next;
+ }
- push(@slaves, $slave);
+ push(@slaves, $slave);
}
if(scalar(@slaves) < $maxKill){
- print STDERR "WARN setting maxKill to ".scalar(@slaves)."\n";
- $maxKill = scalar(@slaves);
+ print STDERR "WARN setting maxKill to ".scalar(@slaves)."\n";
+ $maxKill = scalar(@slaves);
}
if ($minKill > $maxKill){
- print STDERR "WARN setting minKill to equal maxKill\n";
- $minKill = $maxKill;
+ print STDERR "WARN setting minKill to equal maxKill\n";
+ $minKill = $maxKill;
}
while(1){
-
- $numToKill = int(rand($maxKill - $minKill + 1)) + $minKill;
- %killed = {};
-
- for($i = 0; $i < $numToKill; $i++){
- $server = "";
- while($server eq "" || $killed{$server} != undef){
- $index = int(rand(scalar(@slaves)));
- $server = $slaves[$index];
- }
-
- $killed{$server} = 1;
-
- $t = strftime "%Y%m%d %H:%M:%S", localtime;
-
- $rn = rand(1);
- $kill_tserver = 0;
- $kill_datanode = 0;
- if($rn <.33){
- $kill_tserver = 1;
- $kill_datanode = 1;
- }elsif($rn < .66){
- $kill_tserver = 1;
- $kill_datanode = 0;
- }else{
- $kill_tserver = 0;
- $kill_datanode = 1;
- }
-
- print STDERR "$t Killing $server $kill_tserver $kill_datanode\n";
- if($kill_tserver) {
- system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.jar\" tserver KILL");
- }
-
- if($kill_datanode) {
- system("ssh $server pkill -9 -f [p]roc_datanode");
- }
- }
+ $numToKill = int(rand($maxKill - $minKill + 1)) + $minKill;
+ %killed = {};
+ $server = "";
+ $kill_tserver = 0;
+ $kill_datanode = 0;
+
+ for($i = 0; $i < $numToKill; $i++){
+ while($server eq "" || $killed{$server} != undef){
+ $index = int(rand(scalar(@slaves)));
+ $server = $slaves[$index];
+ }
+
+ $killed{$server} = 1;
+
+ $t = strftime "%Y%m%d %H:%M:%S", localtime;
+
+ $rn = rand(1);
+ if ($rn <.33) {
+ $kill_tserver = 1;
+ $kill_datanode = 1;
+ } elsif ($rn < .66) {
+ $kill_tserver = 1;
+ $kill_datanode = 0;
+ } else {
+ $kill_tserver = 0;
+ $kill_datanode = 1;
+ }
+
+ print STDERR "$t Killing $server $kill_tserver $kill_datanode\n";
+ if ($kill_tserver) {
+ system("su -c '$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.jar\" tserver KILL' - $ACCUMULO_USER");
+ }
+
+ if ($kill_datanode) {
+ system("ssh $server pkill -9 -f [p]roc_datanode");
+ }
+ }
$nextsleep2 = int(rand($sleep2max - $sleep2)) + $sleep2;
- sleep($nextsleep2 * 60);
- $t = strftime "%Y%m%d %H:%M:%S", localtime;
- print STDERR "$t Running tup\n";
- system("$ACCUMULO_HOME/bin/tup.sh");
- print STDERR "$t Running start-dfs\n";
- system("$HADOOP_PREFIX/*bin/start-dfs.sh");
+ sleep($nextsleep2 * 60);
+ $t = strftime "%Y%m%d %H:%M:%S", localtime;
+ print STDERR "$t Running tup\n";
+ system("su -c $ACCUMULO_HOME/bin/tup.sh - $ACCUMULO_USER");
+
+ if ($kill_datanode) {
+ print STDERR "$t Starting datanode on $server\n";
+ system("ssh $server 'su -c \"$HADOOP_PREFIX/sbin/hadoop-daemon.sh start datanode\" - $HDFS_USER'");
+ }
$nextsleep1 = int(rand($sleep1max - $sleep1)) + $sleep1;
sleep($nextsleep1 * 60);
[2/4] git commit: ACCUMULO-1932 Add note to continuous-ingest README
that agitator needs to be run as `root`.
Posted by el...@apache.org.
ACCUMULO-1932 Add note to continuous-ingest README that agitator needs to be run as `root`.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7e2238a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7e2238a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7e2238a
Branch: refs/heads/master
Commit: e7e2238ae3b6b5abfeb1c988757a29c6159830f9
Parents: 4637dd7
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 17:03:33 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 17:03:33 2013 -0500
----------------------------------------------------------------------
test/system/continuous/README | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e2238a/test/system/continuous/README
----------------------------------------------------------------------
diff --git a/test/system/continuous/README b/test/system/continuous/README
index 40dbb5f..62af7e3 100644
--- a/test/system/continuous/README
+++ b/test/system/continuous/README
@@ -34,7 +34,8 @@ service that continually collect statistics about accumulo and HDFS.
start-stats.sh
stop-stats.sh
-Optionally, start the agitator to periodically kill random servers.
+Optionally, start the agitator to periodically kill the tabletserver and/or datanode
+process(es) on random nodes. This must be run as root.
start-agitator.sh
stop-agitator.sh
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eaa2f28d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eaa2f28d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eaa2f28d
Branch: refs/heads/master
Commit: eaa2f28d2dd54b04453973373f7c37980dedafa9
Parents: c3befc2 294bed9
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 17:07:09 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 17:07:09 2013 -0500
----------------------------------------------------------------------
test/system/continuous/README | 3 +-
test/system/continuous/agitator.pl | 155 +++++++++++++++++---------------
2 files changed, 85 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/294bed95
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/294bed95
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/294bed95
Branch: refs/heads/master
Commit: 294bed95668921c4ddce23e2f21bf4d8feb46877
Parents: 3711f41 e7e2238
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 17:06:35 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 17:06:35 2013 -0500
----------------------------------------------------------------------
test/system/continuous/README | 3 +-
test/system/continuous/agitator.pl | 155 +++++++++++++++++---------------
2 files changed, 85 insertions(+), 73 deletions(-)
----------------------------------------------------------------------