chihsuan commented on code in PR #10939:
URL: https://github.com/apache/ozone/pull/10939#discussion_r3740944480
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java:
##########
@@ -481,7 +488,7 @@ public void
testSingleNodeWithOpenPipelineCanGotoMaintenance()
// has, then the SCM state should be used and the DN state updated.
waitForDnToReachHealthState(nm, newDn, HEALTHY);
waitForDnToReachOpState(nm, newDn, IN_SERVICE);
- waitForDnToReachPersistedOpState(dn, IN_SERVICE);
+ waitForDnToReachPersistedOpState(newDn, IN_SERVICE);
Review Comment:
Could you help clarify why this change is needed here? It is in a different
test method, so I may be missing how it relates to HDDS-16067.
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java:
##########
@@ -235,11 +240,13 @@ public void
testNodeWithOpenPipelineCanBeDecommissionedAndRecommissioned()
// In the EC case, there should be 5 online
waitForContainerReplicas(ecContainer, 5);
- cluster.restartHddsDatanode(dnIndex, true);
+ cluster.restartHddsDatanode(dnIndex, false);
+ waitForDnToReachHealthState(nm, toDecommission, HEALTHY);
+ DatanodeDetails restarted = nm.getNode(dnID);
scmClient.recommissionNodes(Arrays.asList(
- getDNHostAndPort(toDecommission)));
- waitForDnToReachOpState(nm, toDecommission, IN_SERVICE);
- waitForDnToReachPersistedOpState(toDecommission, IN_SERVICE);
+ getDNHostAndPort(restarted)));
+ waitForDnToReachOpState(nm, restarted, IN_SERVICE);
+ waitForDnToReachPersistedOpState(restarted, IN_SERVICE);
Review Comment:
I tested this without the layout pin above, and the test still failed with
the same `containerCreateInfoTable` NPE in this [wait-only
run](https://github.com/chihsuan/ozone/actions/runs/31260296631).
Do you know if there is another CI failure that still occurs with the layout
fix alone? If not, I’m wondering whether this wait change is needed for this
PR, especially since it reduces the timeout from 120 to 30 seconds.
--
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]
