From 0414ab838764ccaa9b106d1996bc364f6e345bcf Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 19 Aug 2024 18:51:52 -0700 Subject: [PATCH 1/2] HDDS-11325. Intermittent failure in TestBlockOutputStreamWithFailures#testContainerClose. Change-Id: Ie3cad994ad003bac75b1cae82c63cb8d9b45684f --- .../apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java index 7f184f4c41a6..236c0efd885b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java @@ -700,7 +700,8 @@ void testWriteMoreThanMaxFlushSize(boolean flushDelay, boolean enablePiggybackin assertInstanceOf(RatisBlockOutputStream.class, keyOutputStream.getStreamEntries().get(0).getOutputStream()); - assertEquals(4, blockOutputStream.getBufferPool().getSize()); + assertThat(blockOutputStream.getBufferPool().getSize()) + .isLessThanOrEqualTo(4); // writtenDataLength as well flushedDataLength will be updated here assertEquals(dataLength, blockOutputStream.getWrittenDataLength()); From 7e418ca978f84fe66854ede838ebed97e2ad3d19 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 19 Aug 2024 18:54:28 -0700 Subject: [PATCH 2/2] Same Change-Id: I9be6fad05c1c859779499ccc962767dfd57fc3d0 --- .../apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java index 236c0efd885b..8810bab51901 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java @@ -730,7 +730,8 @@ void testWriteMoreThanMaxFlushSize(boolean flushDelay, boolean enablePiggybackin // Since the data in the buffer is already flushed, flush here will have // no impact on the counters and data structures - assertEquals(4, blockOutputStream.getBufferPool().getSize()); + assertThat(blockOutputStream.getBufferPool().getSize()) + .isLessThanOrEqualTo(4); assertEquals(dataLength, blockOutputStream.getWrittenDataLength()); // dataLength > MAX_FLUSH_SIZE assertEquals(flushDelay ? MAX_FLUSH_SIZE : dataLength,