dombizita commented on code in PR #10084:
URL: https://github.com/apache/ozone/pull/10084#discussion_r3110241624
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java:
##########
@@ -1168,6 +1168,28 @@ public HddsProtos.UpgradeStatus queryUpgradeStatus()
throws IOException {
}
}
+ static HddsProtos.UpgradeStatus buildUpgradeStatus(
+ UpgradeFinalization.Status scmUpgradeStatus,
+ int finalizedDatanodes,
+ int totalDatanodes) {
+ return HddsProtos.UpgradeStatus.newBuilder()
+ .setScmFinalized(isScmFinalized(scmUpgradeStatus))
+ .setNumDatanodesFinalized(finalizedDatanodes)
+ .setNumDatanodesTotal(totalDatanodes)
+ .setShouldFinalize(shouldFinalize(scmUpgradeStatus))
+ .build();
+ }
+
+ static boolean isScmFinalized(UpgradeFinalization.Status scmUpgradeStatus) {
+ return UpgradeFinalization.isFinalized(scmUpgradeStatus)
+ || UpgradeFinalization.isDone(scmUpgradeStatus);
+ }
+
+ static boolean shouldFinalize(UpgradeFinalization.Status scmUpgradeStatus) {
Review Comment:
Ohh, this makes sense, that if OM will poll this both of these conditions
should be fulfilled. I added this check and modified the tests.
##########
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java:
##########
@@ -737,6 +737,37 @@ public void testProcessLayoutVersion() throws IOException {
testProcessLayoutVersionReportHigherMlv();
}
+ @Test
Review Comment:
Thanks, added tests for this scenario.
--
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]