diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java index a4eefe7..5f4a7cf 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java @@ -68,17 +68,18 @@ public class RollingBatchRestartRsAction extends BatchRestartRsAction { } catch (org.apache.hadoop.util.Shell.ExitCodeException e) { // We've seen this in test runs where we timeout but the kill went through. HBASE-9743 // So, add to deadServers even if exception so the start gets called. - LOG.info("Problem killing but presume successful; code=" + e.getExitCode(), e); + LOG.info("Problem killing " + server + " but presume successful; code=" + + e.getExitCode(), e); } deadServers.add(server); } else { + ServerName server = deadServers.remove(); try { - ServerName server = deadServers.remove(); startRs(server); } catch (org.apache.hadoop.util.Shell.ExitCodeException e) { // The start may fail but better to just keep going though we may lose server. // - LOG.info("Problem starting, will retry; code=" + e.getExitCode(), e); + LOG.info("Problem starting " + server + ", continuing; code=" + e.getExitCode(), e); } } @@ -123,4 +124,4 @@ public class RollingBatchRestartRsAction extends BatchRestartRsAction { action.perform(); } -} \ No newline at end of file +}