You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2013/09/12 22:19:56 UTC
svn commit: r1522712 - in
/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos:
actions/MoveRandomRegionOfTableAction.java
actions/MoveRegionsOfTableAction.java
factories/SlowDeterministicMonkeyFactory.java
Author: eclark
Date: Thu Sep 12 20:19:56 2013
New Revision: 1522712
URL: http://svn.apache.org/r1522712
Log:
HBASE-9338 Test Big Linked List fails on Hadoop 2.1.0
Modified:
hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java
Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java?rev=1522712&r1=1522711&r2=1522712&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java (original)
+++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java Thu Sep 12 20:19:56 2013
@@ -46,6 +46,10 @@ public class MoveRandomRegionOfTableActi
@Override
public void perform() throws Exception {
+ if (sleepTime > 0) {
+ Thread.sleep(sleepTime);
+ }
+
HBaseTestingUtility util = context.getHaseIntegrationTestingUtility();
HBaseAdmin admin = util.getHBaseAdmin();
Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java?rev=1522712&r1=1522711&r2=1522712&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java (original)
+++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java Thu Sep 12 20:19:56 2013
@@ -47,6 +47,10 @@ public class MoveRegionsOfTableAction ex
@Override
public void perform() throws Exception {
+ if (sleepTime > 0) {
+ Thread.sleep(sleepTime);
+ }
+
HBaseAdmin admin = this.context.getHaseIntegrationTestingUtility().getHBaseAdmin();
List<HRegionInfo> regions = admin.getTableRegions(tableNameBytes);
@@ -63,9 +67,9 @@ public class MoveRegionsOfTableAction ex
} catch (Exception e) {
LOG.debug("Error moving region", e);
}
- }
- if (sleepTime > 0) {
- Thread.sleep(sleepTime);
+ if (sleepTime > 0) {
+ Thread.sleep(sleepTime);
+ }
}
}
}
Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java?rev=1522712&r1=1522711&r2=1522712&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java (original)
+++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/SlowDeterministicMonkeyFactory.java Thu Sep 12 20:19:56 2013
@@ -54,8 +54,7 @@ public class SlowDeterministicMonkeyFact
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 SlowDeterministicMonkeyFact
// 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,