This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ca0e9acfd3 HDDS-8908. Intermittent failure in
TestBlockDeletion#testBlockDeletion (#4958)
ca0e9acfd3 is described below
commit ca0e9acfd3fb1794ac89676d9905b0b9c54c75ca
Author: ashishkumar50 <[email protected]>
AuthorDate: Sat Jun 24 01:49:01 2023 +0530
HDDS-8908. Intermittent failure in TestBlockDeletion#testBlockDeletion
(#4958)
---
.../statemachine/commandhandler/TestBlockDeletion.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
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 9e622f35f6..19bb18b92a 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 @@ public class TestBlockDeletion {
@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 class TestBlockDeletion {
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
