From 25b7a8167871248de177117a50757ec99bf3995f Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Tue, 21 Oct 2014 15:05:59 -0700 Subject: [PATCH] HBASE-12314 Add chaos monkey policy to execute two actions concurrently Conflicts: hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/NoKillMonkeyFactory.java Amending-Author: Andrew Purtell --- .../hbase/chaos/factories/NoKillMonkeyFactory.java | 18 +++++++++++------- .../factories/SlowDeterministicMonkeyFactory.java | 1 - 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/NoKillMonkeyFactory.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/NoKillMonkeyFactory.java index c41a7a8..def9df0 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/NoKillMonkeyFactory.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/NoKillMonkeyFactory.java @@ -47,8 +47,9 @@ import org.apache.hadoop.hbase.chaos.policies.TwoConcurrentActionPolicy; public class NoKillMonkeyFactory extends MonkeyFactory { @Override public ChaosMonkey build() { Action[] actions1 = new Action[] { - new CompactTableAction(tableName, 60*1000), - new CompactRandomRegionOfTableAction(tableName,0.6f), + new CompactTableAction(tableName, MonkeyConstants.DEFAULT_PERIODIC_ACTION1_PERIOD), + new CompactRandomRegionOfTableAction(tableName, + MonkeyConstants.DEFAULT_COMPACT_RANDOM_REGION_RATIO), new FlushTableAction(tableName), new FlushRandomRegionOfTableAction(tableName), new MoveRandomRegionOfTableAction(tableName) @@ -67,8 +68,11 @@ public class NoKillMonkeyFactory extends MonkeyFactory { }; Action[] actions3 = new Action[] { - new MoveRegionsOfTableAction(800,1600,tableName), - new MoveRandomRegionOfTableAction(800,tableName), + new MoveRegionsOfTableAction(MonkeyConstants.DEFAULT_MOVE_REGIONS_SLEEP_TIME, + MonkeyConstants.DEFAULT_MOVE_REGIONS_MAX_TIME, + tableName), + new MoveRandomRegionOfTableAction(MonkeyConstants.DEFAULT_RESTART_ACTIVE_MASTER_SLEEP_TIME, + tableName), }; Action[] actions4 = new Action[] { @@ -76,8 +80,8 @@ public class NoKillMonkeyFactory extends MonkeyFactory { }; return new PolicyBasedChaosMonkey(util, - new TwoConcurrentActionPolicy(60*1000, actions1, actions2), - new PeriodicRandomActionPolicy(90*1000,actions3), - new PeriodicRandomActionPolicy(90*1000,actions4)); + new TwoConcurrentActionPolicy(MonkeyConstants.DEFAULT_PERIODIC_ACTION1_PERIOD, actions1, actions2), + new PeriodicRandomActionPolicy(MonkeyConstants.DEFAULT_PERIODIC_ACTION2_PERIOD,actions3), + new PeriodicRandomActionPolicy(MonkeyConstants.DEFAULT_PERIODIC_ACTION4_PERIOD,actions4)); } } diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java index 70d64b9..6195737 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java @@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey; import org.apache.hadoop.hbase.chaos.policies.CompositeSequentialPolicy; import org.apache.hadoop.hbase.chaos.policies.DoActionsOncePolicy; import org.apache.hadoop.hbase.chaos.policies.PeriodicRandomActionPolicy; -import org.junit.Assert; public class SlowDeterministicMonkeyFactory extends MonkeyFactory { -- 1.7.12.4 (Apple Git-37)