From f1c2e16e5826fa57f28e58ad86e935eccf9bf009 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Wed, 11 Sep 2013 12:58:45 -0700 Subject: [PATCH] HBASE-9338 Test Big Linked List fails on Hadoop 2.1.0 --- .../hbase/chaos/actions/MoveRandomRegionOfTableAction.java | 4 ++++ .../hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java | 10 +++++++--- .../chaos/factories/SlowDeterministicMonkeyFactory.java | 10 +++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java index 9652a5a..588f9ba 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java @@ -46,6 +46,10 @@ public class MoveRandomRegionOfTableAction extends Action { @Override public void perform() throws Exception { + if (sleepTime > 0) { + Thread.sleep(sleepTime); + } + HBaseTestingUtility util = context.getHaseIntegrationTestingUtility(); HBaseAdmin admin = util.getHBaseAdmin(); diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java index 8f8fd82..2e6a380 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java @@ -47,6 +47,10 @@ public class MoveRegionsOfTableAction extends Action { @Override public void perform() throws Exception { + if (sleepTime > 0) { + Thread.sleep(sleepTime); + } + HBaseAdmin admin = this.context.getHaseIntegrationTestingUtility().getHBaseAdmin(); List regions = admin.getTableRegions(tableNameBytes); @@ -63,9 +67,9 @@ public class MoveRegionsOfTableAction extends Action { } catch (Exception e) { LOG.debug("Error moving region", e); } - } - if (sleepTime > 0) { - Thread.sleep(sleepTime); + if (sleepTime > 0) { + Thread.sleep(sleepTime); + } } } } diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java index 6c71a26..83260b9 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java @@ -54,8 +54,7 @@ public class SlowDeterministicMonkeyFactory extends MonkeyFactory { new CompactTableAction(tableName, 0.5f), new CompactRandomRegionOfTableAction(tableName, 0.6f), new FlushTableAction(tableName), - new FlushRandomRegionOfTableAction(tableName), - new MoveRandomRegionOfTableAction(tableName) + new FlushRandomRegionOfTableAction(tableName) }; // Actions such as split/merge/snapshot. @@ -69,12 +68,13 @@ public class SlowDeterministicMonkeyFactory extends MonkeyFactory { // Destructive actions to mess things around. Action[] actions3 = new Action[] { - new MoveRegionsOfTableAction(tableName), + new MoveRegionsOfTableAction(20000, tableName), + new MoveRandomRegionOfTableAction(20000, tableName), new RestartRandomRsAction(60000), - new BatchRestartRsAction(5000, 0.5f), + new BatchRestartRsAction(60000, 0.5f), new RestartActiveMasterAction(5000), new RollingBatchRestartRsAction(5000, 1.0f), - new RestartRsHoldingMetaAction(35000) + new RestartRsHoldingMetaAction(35000), }; return new PolicyBasedChaosMonkey(util, -- 1.7.10.2 (Apple Git-33)