hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject svn commit: r1466163 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/hbase/util/
Date Tue, 09 Apr 2013 18:05:03 GMT
Author: sershe
Date: Tue Apr  9 18:05:02 2013
New Revision: 1466163

URL: http://svn.apache.org/r1466163
Log:
HBASE-8239 ChaosMonkey action for root is irrelevant

Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1466163&r1=1466162&r2=1466163&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Tue Apr
 9 18:05:02 2013
@@ -154,7 +154,7 @@ public class HRegionInfo implements Comp
   /**
    * Use logging.
    * @param encodedRegionName The encoded regionname.
-   * @return <code>.META.</code> if passed </code>1028785192</code>
else returns
+   * @return <code>.META.</code> if passed <code>1028785192</code>
else returns
    * <code>encodedRegionName</code>
    */
   public static String prettyPrint(final String encodedRegionName) {

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java?rev=1466163&r1=1466162&r2=1466163&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
Tue Apr  9 18:05:02 2013
@@ -290,4 +290,4 @@ public class DistributedHBaseCluster ext
       stopRegionServer(currentServers.get(hostname));
     }
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java?rev=1466163&r1=1466162&r2=1466163&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java
Tue Apr  9 18:05:02 2013
@@ -22,7 +22,6 @@ import org.apache.hadoop.hbase.util.Chao
 import org.apache.hadoop.hbase.util.ChaosMonkey.RestartActiveMaster;
 import org.apache.hadoop.hbase.util.ChaosMonkey.RestartRandomRs;
 import org.apache.hadoop.hbase.util.ChaosMonkey.RestartRsHoldingMeta;
-import org.apache.hadoop.hbase.util.ChaosMonkey.RestartRsHoldingRoot;
 import org.apache.hadoop.hbase.util.ChaosMonkey.RollingBatchRestartRs;
 import org.junit.After;
 import org.junit.Before;
@@ -51,8 +50,7 @@ public class IntegrationTestDataIngestSl
         new BatchRestartRs(5000, 0.5f),
         new RestartActiveMaster(5000),
         new RollingBatchRestartRs(5000, 1.0f),
-        new RestartRsHoldingMeta(35000),
-        new RestartRsHoldingRoot(35000)
+        new RestartRsHoldingMeta(35000)
     };
     monkey = new ChaosMonkey(util, new ChaosMonkey.CompositeSequentialPolicy(
             new ChaosMonkey.DoActionsOncePolicy(CHAOS_EVERY_MS, actions),

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java?rev=1466163&r1=1466162&r2=1466163&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java (original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java Tue Apr
 9 18:05:02 2013
@@ -294,22 +294,6 @@ public class ChaosMonkey extends Abstrac
     }
   }
 
-  public static class RestartRsHoldingRoot extends RestartRandomRs {
-    public RestartRsHoldingRoot(long sleepTime) {
-      super(sleepTime);
-    }
-    @Override
-    protected void perform() throws Exception {
-      LOG.info("Performing action: Restart region server holding ROOT");
-      ServerName server = cluster.getServerHoldingRoot();
-      if (server == null) {
-        LOG.warn("No server is holding -ROOT- right now.");
-        return;
-      }
-      restartRs(server, sleepTime);
-    }
-  }
-
   /**
    * Restarts a ratio of the running regionservers at the same time
    */
@@ -659,7 +643,6 @@ public class ChaosMonkey extends Abstrac
    *  - Restart random regionserver (sleep 5 sec)              : 2
    *  - Restart random regionserver (sleep 60 sec)             : 2
    *  - Restart META regionserver (sleep 5 sec)                : 1
-   *  - Restart ROOT regionserver (sleep 5 sec)                : 1
    *  - Batch restart of 50% of regionservers (sleep 5 sec)    : 2
    *  - Rolling restart of 100% of regionservers (sleep 5 sec) : 2
    */
@@ -669,7 +652,6 @@ public class ChaosMonkey extends Abstrac
       new Pair<Action,Integer>(new RestartRandomRs(FIVE_SEC), 2),
       new Pair<Action,Integer>(new RestartRandomRs(ONE_MIN), 2),
       new Pair<Action,Integer>(new RestartRsHoldingMeta(FIVE_SEC), 1),
-      new Pair<Action,Integer>(new RestartRsHoldingRoot(FIVE_SEC), 1),
       new Pair<Action,Integer>(new BatchRestartRs(FIVE_SEC, 0.5f), 2),
       new Pair<Action,Integer>(new RollingBatchRestartRs(FIVE_SEC, 1.0f), 2)
   );



Mime
View raw message