sodonnel commented on code in PR #10084:
URL: https://github.com/apache/ozone/pull/10084#discussion_r3116850748
##########
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:
ShouldFinalize should be true when SCM is finalized and all DNs are
finalized as it is the trigger for other components to finalize. I think the
existing enum states are quite confusing:
```
public enum Status {
ALREADY_FINALIZED, => I think its this value if it startups up
already finalized?
STARTING_FINALIZATION,
FINALIZATION_IN_PROGRESS,
FINALIZATION_DONE, => It gets here if it was REQUIRED and then
gets finalized.
FINALIZATION_REQUIRED, => Starts up unfinalized.
}
```
So I think here we need to check:
```
if ((UpgradeFinalization.Status.FINALIZATION_DONE.equals(scmUpgradeStatus)
|| UpgradeFinalization.Status.ALREADY_FINALIZED.equals(scmUpgradeStatus))
&& finalizedDatanodes == healthyDatanodes) {
// Should finalize == true
} else {
// should finalize == false
}
```
--
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]