dombizita commented on code in PR #10084:
URL: https://github.com/apache/ozone/pull/10084#discussion_r3116933838


##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java:
##########
@@ -1168,6 +1173,30 @@ public HddsProtos.UpgradeStatus queryUpgradeStatus() 
throws IOException {
     }
   }
 
+  static HddsProtos.UpgradeStatus buildUpgradeStatus(
+      UpgradeFinalization.Status scmUpgradeStatus,
+      int finalizedDatanodes,
+      int healthyDatanodes) {
+    return HddsProtos.UpgradeStatus.newBuilder()
+        .setScmFinalized(isScmFinalized(scmUpgradeStatus))
+        .setNumDatanodesFinalized(finalizedDatanodes)
+        .setNumDatanodesTotal(healthyDatanodes)
+        .setShouldFinalize(
+            shouldFinalize(scmUpgradeStatus, finalizedDatanodes, 
healthyDatanodes))
+        .build();
+  }
+
+  static boolean isScmFinalized(UpgradeFinalization.Status scmUpgradeStatus) {
+    return UpgradeFinalization.isFinalized(scmUpgradeStatus)
+        || UpgradeFinalization.isDone(scmUpgradeStatus);
+  }
+
+  static boolean shouldFinalize(UpgradeFinalization.Status scmUpgradeStatus,
+      int finalizedDatanodes, int healthyDatanodes) {
+    return 
UpgradeFinalization.Status.FINALIZATION_REQUIRED.equals(scmUpgradeStatus)

Review Comment:
   Ohh, thanks, I only added the check for `numDBs == finalizedDNs` in the 
previous round of review, forgot to fix the SCM finalization check, as OM will 
poll this status.
   Shouldn't the CLI output be more specific about this? Like "OM should 
finalize"?
   
https://github.com/apache/ozone/blob/6c4d85254250668defac734f8b7a7f0fa5ac07e3/hadoop-ozone/cli-admin/src/main/java/org/apache/hadoop/ozone/admin/upgrade/StatusSubCommand.java#L43-L47
   



-- 
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]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to