diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java index 9e622f35f6b5..19bb18b92abc 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java @@ -206,7 +206,6 @@ private static Stream replicationConfigs() { @ParameterizedTest @MethodSource("replicationConfigs") - @Flaky("HDDS-8908") public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { String volumeName = UUID.randomUUID().toString(); String bucketName = UUID.randomUUID().toString(); @@ -321,10 +320,15 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { LOG.info(metrics.toString()); // Datanode should receive retried requests with continuous retry counts. - Assertions.assertTrue(logCapturer.getOutput().contains("1(0)")); - Assertions.assertTrue(logCapturer.getOutput().contains("1(1)")); - Assertions.assertTrue(logCapturer.getOutput().contains("1(2)")); - Assertions.assertTrue(logCapturer.getOutput().contains("1(3)")); + for (int i = 5; i >= 0; i--) { + if (logCapturer.getOutput().contains("1(" + i + ")")) { + for (int j = 0; j <= i; j++) { + Assertions.assertTrue(logCapturer.getOutput() + .contains("1(" + i + ")")); + } + break; + } + } } @Test