wchevreuil commented on code in PR #4383:
URL: https://github.com/apache/hbase/pull/4383#discussion_r861792717
##########
backup.diff:
##########
@@ -0,0 +1,145 @@
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+index f4ef7978c9..f5458d1d54 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+@@ -63,7 +63,10 @@ public class GracefulRollingRestartRsAction extends
RestartActionBaseAction {
+ rm.load();
+ } catch (Shell.ExitCodeException e) {
+ getLogger().info("Problem restarting but presume successful;
code={}", e.getExitCode(), e);
++ } catch (Exception e) {
++ getLogger().info("Got Exception: " + e + ", continue");
+ }
++
+ sleep(RandomUtils.nextInt(0, (int)sleepTime));
+ }
+ getLogger().info("Enabling balancer");
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+index ce41522fe7..d927055a3f 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+@@ -68,6 +68,8 @@ public abstract class RestartActionBaseAction extends Action
{
+ sleep(sleepTime);
+ getLogger().info("Starting region server: {}", server);
+ startRs(server);
++ // Sleep 2 seconds to make sure RS is online.
++ sleep(2000);
+ }
+
+ void restartRs(ServerName server, long sleepTime) throws IOException {
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
+index 676b04d3fe..024d3d4e21 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
+@@ -50,16 +50,16 @@ public class ServerAndDependenciesKillingMonkeyFactory
extends MonkeyFactory {
+
+ // Destructive actions to mess things around. Cannot run batch restart.
+ Action[] actions1 = new Action[]{
+- new RestartRandomRsExceptMetaAction(60000),
+- new RestartActiveMasterAction(5000),
+- new RollingBatchRestartRsAction(5000, 1.0f, 2,
+- true), // only allow 2 servers to be dead.
+- new ForceBalancerAction(),
+- new RestartRandomDataNodeAction(60000),
+- new RestartRandomZKNodeAction(60000),
++ //new RestartRandomRsExceptMetaAction(60000),
++ //new RestartActiveMasterAction(5000),
++ //new RollingBatchRestartRsAction(5000, 1.0f, 2,
++ // true), // only allow 2 servers to be dead.
++ //new ForceBalancerAction(),
++ //new RestartRandomDataNodeAction(60000),
++ //new RestartRandomZKNodeAction(60000),
+ new GracefulRollingRestartRsAction(gracefulRollingRestartTSSLeepTime),
+- new RollingBatchSuspendResumeRsAction(rollingBatchSuspendRSSleepTime,
+- rollingBatchSuspendtRSRatio)
++ //new RollingBatchSuspendResumeRsAction(rollingBatchSuspendRSSleepTime,
++ // rollingBatchSuspendtRSRatio)
Review Comment:
I guess these were left commented by mistake? Otherwise, could you explain
why none of these actions are needed anymore and remove it altogether from this
code?
##########
backup.diff:
##########
@@ -0,0 +1,145 @@
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+index f4ef7978c9..f5458d1d54 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+@@ -63,7 +63,10 @@ public class GracefulRollingRestartRsAction extends
RestartActionBaseAction {
+ rm.load();
+ } catch (Shell.ExitCodeException e) {
+ getLogger().info("Problem restarting but presume successful;
code={}", e.getExitCode(), e);
++ } catch (Exception e) {
++ getLogger().info("Got Exception: " + e + ", continue");
+ }
++
+ sleep(RandomUtils.nextInt(0, (int)sleepTime));
+ }
+ getLogger().info("Enabling balancer");
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+index ce41522fe7..d927055a3f 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+@@ -68,6 +68,8 @@ public abstract class RestartActionBaseAction extends Action
{
+ sleep(sleepTime);
+ getLogger().info("Starting region server: {}", server);
+ startRs(server);
++ // Sleep 2 seconds to make sure RS is online.
++ sleep(2000);
Review Comment:
Make it configurable?
##########
backup.diff:
##########
@@ -0,0 +1,145 @@
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+index f4ef7978c9..f5458d1d54 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/GracefulRollingRestartRsAction.java
+@@ -63,7 +63,10 @@ public class GracefulRollingRestartRsAction extends
RestartActionBaseAction {
+ rm.load();
+ } catch (Shell.ExitCodeException e) {
+ getLogger().info("Problem restarting but presume successful;
code={}", e.getExitCode(), e);
++ } catch (Exception e) {
++ getLogger().info("Got Exception: " + e + ", continue");
+ }
++
+ sleep(RandomUtils.nextInt(0, (int)sleepTime));
+ }
+ getLogger().info("Enabling balancer");
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+index ce41522fe7..d927055a3f 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartActionBaseAction.java
+@@ -68,6 +68,8 @@ public abstract class RestartActionBaseAction extends Action
{
+ sleep(sleepTime);
+ getLogger().info("Starting region server: {}", server);
+ startRs(server);
++ // Sleep 2 seconds to make sure RS is online.
++ sleep(2000);
+ }
+
+ void restartRs(ServerName server, long sleepTime) throws IOException {
+diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
+index 676b04d3fe..024d3d4e21 100644
+---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
++++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/ServerAndDependenciesKillingMonkeyFactory.java
+@@ -50,16 +50,16 @@ public class ServerAndDependenciesKillingMonkeyFactory
extends MonkeyFactory {
+
+ // Destructive actions to mess things around. Cannot run batch restart.
+ Action[] actions1 = new Action[]{
+- new RestartRandomRsExceptMetaAction(60000),
+- new RestartActiveMasterAction(5000),
+- new RollingBatchRestartRsAction(5000, 1.0f, 2,
+- true), // only allow 2 servers to be dead.
+- new ForceBalancerAction(),
+- new RestartRandomDataNodeAction(60000),
+- new RestartRandomZKNodeAction(60000),
++ //new RestartRandomRsExceptMetaAction(60000),
++ //new RestartActiveMasterAction(5000),
++ //new RollingBatchRestartRsAction(5000, 1.0f, 2,
++ // true), // only allow 2 servers to be dead.
++ //new ForceBalancerAction(),
++ //new RestartRandomDataNodeAction(60000),
++ //new RestartRandomZKNodeAction(60000),
+ new GracefulRollingRestartRsAction(gracefulRollingRestartTSSLeepTime),
+- new RollingBatchSuspendResumeRsAction(rollingBatchSuspendRSSleepTime,
+- rollingBatchSuspendtRSRatio)
++ //new RollingBatchSuspendResumeRsAction(rollingBatchSuspendRSSleepTime,
++ // rollingBatchSuspendtRSRatio)
+ };
+
+ // Action to log more info for debugging
+diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
+index e10f34257e..8afca2447b 100644
+---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
++++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
+@@ -94,6 +94,8 @@ public class TestScannersFromClientSide {
+ private static byte [] ROW = Bytes.toBytes("testRow");
+ private static byte [] FAMILY = Bytes.toBytes("testFamily");
+ private static byte [] QUALIFIER = Bytes.toBytes("testQualifier");
++ private static byte [] QUALIFIER1 = Bytes.toBytes("testQualifier1");
++ private static byte [] QUALIFIER2 = Bytes.toBytes("testQualifier2");
+ private static byte [] VALUE = Bytes.toBytes("testValue");
+
+ @Rule public TableNameTestRule name = new TableNameTestRule();
+@@ -120,8 +122,8 @@ public class TestScannersFromClientSide {
+ public static Collection<Object[]> parameters() {
+ return Arrays.asList(new Object[][] {
+ { MasterRegistry.class, 1},
+- { MasterRegistry.class, 2},
+- { ZKConnectionRegistry.class, 1}
++ //{ MasterRegistry.class, 2},
++ //{ ZKConnectionRegistry.class, 1}
Review Comment:
Same as above for other block of commented code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
