From fd676e190a4b575121d55e49357d3d497456f10c Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Fri, 12 Apr 2019 11:34:43 +0200
Subject: [PATCH] HDDS-1426. Minor logging improvements for
 MiniOzoneChaosCluster

Closes #730
---
 .../integration-test/src/test/bin/start-chaos.sh         | 2 +-
 .../org/apache/hadoop/ozone/MiniOzoneChaosCluster.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/integration-test/src/test/bin/start-chaos.sh b/hadoop-ozone/integration-test/src/test/bin/start-chaos.sh
index 63e4a95a6a6..d98e9ca9770 100755
--- a/hadoop-ozone/integration-test/src/test/bin/start-chaos.sh
+++ b/hadoop-ozone/integration-test/src/test/bin/start-chaos.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-date=`date +"%m-%d-%y-%T"`
+date=`date +"%Y-%m-%d--%H-%M-%S-%Z"`
 fileformat=".MiniOzoneChaosCluster.log"
 heapformat=".dump"
 current="/tmp/"
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 52a2d40abc2..8bef479419c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -87,11 +87,15 @@ private int getNodeToFail() {
   }
 
   private void failNodes() {
-    for (int i = 0; i < getNumberOfNodesToFail(); i++) {
+    final int numNodesToFail = getNumberOfNodesToFail();
+    LOG.info("Will restart {} nodes to simulate failure", numNodesToFail);
+    for (int i = 0; i < numNodesToFail; i++) {
       boolean failureMode = isFastRestart();
       int failedNodeIndex = getNodeToFail();
       try {
+        LOG.info("Restarting DataNodeIndex {}", failedNodeIndex);
         restartHddsDatanode(failedNodeIndex, failureMode);
+        LOG.info("Completed restarting DataNodeIndex {}", failedNodeIndex);
       } catch (Exception e) {
 
       }
@@ -118,7 +122,8 @@ private void fail() {
   }
 
   void startChaos(long initialDelay, long period, TimeUnit timeUnit) {
-    LOG.info("Starting Chaos with failure period:{} unit:{}", period, timeUnit);
+    LOG.info("Starting Chaos with failure period:{} unit:{} numDataNodes:{}",
+        period, timeUnit, numDatanodes);
     scheduledFuture = executorService.scheduleAtFixedRate(this::fail,
         initialDelay, period, timeUnit);
   }