HBASE-18629 Enhance ChaosMonkeyRunner with interruptibility - revert addendum
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/70da5541 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/70da5541 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/70da5541 Branch: refs/heads/HBASE-14070.HLC Commit: 70da554183213778911d3ed0537402c6cfeab173 Parents: fef7e8f Author: tedyu <[email protected]> Authored: Mon Aug 21 10:01:42 2017 -0700 Committer: tedyu <[email protected]> Committed: Mon Aug 21 10:01:42 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/70da5541/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java index 80f99e5..f142321 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/util/ChaosMonkeyRunner.java @@ -45,8 +45,6 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool { public static final String TABLE_NAME_OPT = "tableName"; public static final String FAMILY_NAME_OPT = "familyName"; - private static ChaosMonkeyRunner runner; - protected IntegrationTestingUtility util; protected ChaosMonkey monkey; protected String monkeyToUse; @@ -101,8 +99,8 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool { return 0; } - public static void stopRunner() { - runner.stop = true; + public void stopRunner() { + stop = true; } public void setUpCluster() throws Exception { @@ -178,8 +176,7 @@ public class ChaosMonkeyRunner extends AbstractHBaseTool { System.arraycopy(args, 2, actualArgs, 0, argCount); } IntegrationTestingUtility.setUseDistributedCluster(conf); - runner = new ChaosMonkeyRunner(); - int ret = ToolRunner.run(conf, runner, actualArgs); + int ret = ToolRunner.run(conf, new ChaosMonkeyRunner(), actualArgs); System.exit(ret); }
