From 5221e114dcde483fe46f41e8684a43fc7c9affd5 Mon Sep 17 00:00:00 2001
From: Sadanand Shenoy <sadanand.shenoy@cloudera.com>
Date: Tue, 11 Mar 2025 14:32:41 +0530
Subject: [PATCH] HDDS-12458. Show safemode rules status irrespective of
 whether SCM is in safe mode in verbose mode.

---
 .../hdds/scm/cli/SafeModeCheckSubcommand.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
index 44fd4968995c..265b23c25d36 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/SafeModeCheckSubcommand.java
@@ -46,16 +46,16 @@ public void execute(ScmClient scmClient) throws IOException {
     // Output data list
     if (execReturn) {
       System.out.println("SCM is in safe mode.");
-      if (verbose) {
-        for (Map.Entry<String, Pair<Boolean, String>> entry :
-            scmClient.getSafeModeRuleStatuses().entrySet()) {
-          Pair<Boolean, String> value = entry.getValue();
-          System.out.printf("validated:%s, %s, %s%n",
-              value.getLeft(), entry.getKey(), value.getRight());
-        }
-      }
     } else {
       System.out.println("SCM is out of safe mode.");
     }
+    if (verbose) {
+      for (Map.Entry<String, Pair<Boolean, String>> entry :
+          scmClient.getSafeModeRuleStatuses().entrySet()) {
+        Pair<Boolean, String> value = entry.getValue();
+        System.out.printf("validated:%s, %s, %s%n",
+            value.getLeft(), entry.getKey(), value.getRight());
+      }
+    }
   }
 }