echonesis commented on code in PR #10939:
URL: https://github.com/apache/ozone/pull/10939#discussion_r3746913117


##########
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:
   Thanks for isolating the changes. I’m not aware of another CI failure that 
still occurs with the layout fix alone. My earlier full-class flaky-test-check 
compared the wait-only change with the combined patch, so it did not establish 
that this wait change provided any additional benefit.
   
   I agree that reducing the timeout from 120 to 30 seconds could introduce a 
separate failure on slower runners. I’ve restored the original 
restartHddsDatanode(dnIndex, true) flow and removed the refreshed 
DatanodeDetails changes, leaving only the layout-version fix.



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