hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject svn commit: r1502143 - in /hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase: mttr/IntegrationTestMTTR.java util/ChaosMonkey.java
Date Thu, 11 Jul 2013 08:10:00 GMT
Author: eclark
Date: Thu Jul 11 08:09:59 2013
New Revision: 1502143

URL: http://svn.apache.org/r1502143
Log:
HBASE-8924 Master Can fail to come up after chaos monkey if the sleep time is too short.

Modified:
    hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
    hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java

Modified: hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java?rev=1502143&r1=1502142&r2=1502143&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
(original)
+++ hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
Thu Jul 11 08:09:59 2013
@@ -172,8 +172,8 @@ public class IntegrationTestMTTR {
     // Set up the action that will move the regions of our table.
     moveRegionAction = new ChaosMonkey.MoveRegionsOfTable(SLEEP_TIME, tableName);
 
-    // Kill the master (No sleep time because there is only one master running at this time.)
-    restartMasterAction = new ChaosMonkey.RestartActiveMaster(0l);
+    // Kill the master
+    restartMasterAction = new ChaosMonkey.RestartActiveMaster(1000);
 
     // Give the action the access to the cluster.
     ChaosMonkey.ActionContext actionContext = new ChaosMonkey.ActionContext(util);

Modified: hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java?rev=1502143&r1=1502142&r2=1502143&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
(original)
+++ hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
Thu Jul 11 08:09:59 2013
@@ -239,12 +239,14 @@ public class ChaosMonkey extends Abstrac
     }
 
     void restartMaster(ServerName server, long sleepTime) throws IOException {
+      sleepTime = Math.max(sleepTime, 1000);
       killMaster(server);
       sleep(sleepTime);
       startMaster(server);
     }
 
     void restartRs(ServerName server, long sleepTime) throws IOException {
+      sleepTime = Math.max(sleepTime, 1000);
       killRs(server);
       sleep(sleepTime);
       startRs(server);



Mime
View raw message