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 3bd237d1bd HDDS-11325. (addendum) Intermittent failure in
TestBlockOutputStreamWithFailures#testContainerClose (#7121)
3bd237d1bd is described below
commit 3bd237d1bdd07bca47bbdb4749717a4f35753991
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Wed Aug 28 03:47:29 2024 -0700
HDDS-11325. (addendum) Intermittent failure in
TestBlockOutputStreamWithFailures#testContainerClose (#7121)
---
.../hadoop/ozone/client/rpc/TestBlockOutputStream.java | 2 --
.../client/rpc/TestBlockOutputStreamWithFailures.java | 18 +++++++++++-------
2 files changed, 11 insertions(+), 9 deletions(-)
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 8810bab519..4c978683de 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
@@ -48,7 +48,6 @@ import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.TestHelper;
-import org.apache.ozone.test.tag.Flaky;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestInstance;
@@ -662,7 +661,6 @@ class TestBlockOutputStream {
@ParameterizedTest
@MethodSource("clientParameters")
- @Flaky("HDDS-11325")
void testWriteMoreThanMaxFlushSize(boolean flushDelay, boolean
enablePiggybacking) throws Exception {
OzoneClientConfig config = newClientConfig(cluster.getConf(), flushDelay,
enablePiggybacking);
try (OzoneClient client = newClient(cluster.getConf(), config)) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java
index f823add57b..5e5461634c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java
@@ -93,7 +93,6 @@ class TestBlockOutputStreamWithFailures {
@ParameterizedTest
@MethodSource("clientParameters")
- @Flaky("HDDS-11325")
void testContainerClose(boolean flushDelay, boolean enablePiggybacking)
throws Exception {
OzoneClientConfig config = newClientConfig(cluster.getConf(), flushDelay,
enablePiggybacking);
try (OzoneClient client = newClient(cluster.getConf(), config)) {
@@ -386,7 +385,8 @@ class TestBlockOutputStreamWithFailures {
assertInstanceOf(RatisBlockOutputStream.class,
keyOutputStream.getStreamEntries().get(0).getOutputStream());
- assertEquals(4, blockOutputStream.getBufferPool().getSize());
+ assertThat(blockOutputStream.getBufferPool().getSize())
+ .isLessThanOrEqualTo(4);
assertEquals(dataLength, blockOutputStream.getWrittenDataLength());
assertEquals(400, blockOutputStream.getTotalDataFlushedLength());
@@ -442,7 +442,8 @@ class TestBlockOutputStreamWithFailures {
assertInstanceOf(RatisBlockOutputStream.class,
keyOutputStream.getStreamEntries().get(0).getOutputStream());
- assertEquals(2, blockOutputStream.getBufferPool().getSize());
+ assertThat(blockOutputStream.getBufferPool().getSize())
+ .isLessThanOrEqualTo(2);
assertEquals(dataLength, blockOutputStream.getWrittenDataLength());
assertEquals(0, blockOutputStream.getTotalDataFlushedLength());
@@ -455,7 +456,8 @@ class TestBlockOutputStreamWithFailures {
// Since the data in the buffer is already flushed, flush here will have
// no impact on the counters and data structures
- assertEquals(2, blockOutputStream.getBufferPool().getSize());
+ assertThat(blockOutputStream.getBufferPool().getSize())
+ .isLessThanOrEqualTo(2);
assertEquals(dataLength, blockOutputStream.getWrittenDataLength());
assertEquals(dataLength, blockOutputStream.getTotalDataFlushedLength());
@@ -506,9 +508,10 @@ class TestBlockOutputStreamWithFailures {
keyOutputStream.getStreamEntries().get(0).getOutputStream());
// we have just written data more than flush Size(2 chunks), at this time
- // buffer pool will have 4 buffers allocated worth of chunk size
+ // buffer pool will have up to 4 buffers allocated worth of chunk size
- assertEquals(4, blockOutputStream.getBufferPool().getSize());
+ assertThat(blockOutputStream.getBufferPool().getSize())
+ .isLessThanOrEqualTo(4);
// writtenDataLength as well flushedDataLength will be updated here
assertEquals(dataLength, blockOutputStream.getWrittenDataLength());
@@ -531,7 +534,8 @@ class TestBlockOutputStreamWithFailures {
// 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());
assertEquals(dataLength, blockOutputStream.getTotalDataFlushedLength());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
