HDFS-17520. [BugFix] TestDFSAdmin.testAllDatanodesReconfig and TestDF…

…SAdmin.testDecommissionDataNodesReconfig failed (#6812) Contributed by Zengqiang Xu. Reviewed-by: Vinayakumar B <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
apache · May 14, 2024 · cab0f4c · cab0f4c
1 parent 2e77b7b
commit cab0f4c
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -2095,22 +2095,20 @@ int getReconfigurationStatus(final String nodeType, final String address, final
     if (errMsg != null) {
       err.println(errMsg);
       return 1;
-    } else {
-      out.print(outMsg);
     }
 
     if (status != null) {
       if (!status.hasTask()) {
-        out.println("no task was found.");
+        out.println(outMsg + "no task was found.");
         return 0;
       }
-      out.print("started at " + new Date(status.getStartTime()));
+      String startMsg = outMsg + "started at " + new Date(status.getStartTime());
       if (!status.stopped()) {
-        out.println(" and is still running.");
+        out.println(startMsg + " and is still running.");
         return 0;
       }
 
-      out.println(" and finished at "
+      out.println(startMsg + " and finished at "
           + new Date(status.getEndTime()).toString() + ".");
       if (status.getStatus() == null) {
         // Nothing to report.
@@ -2133,6 +2131,7 @@ int getReconfigurationStatus(final String nodeType, final String address, final
         }
       }
     } else {
+      out.println(outMsg);
       return 1;
     }