Skip to content

HDDS-11325. (addendum) Intermittent failure in TestBlockOutputStreamWithFailures#testContainerClose #7121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Aug 28, 2024
Merged

HDDS-11325. (addendum) Intermittent failure in TestBlockOutputStreamWithFailures#testContainerClose #7121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c91e68
HDDS-11325. Intermittent failure in TestBlockOutputStreamWithFailures…
jojochuang Aug 21, 2024
5458cd8
Fix flaky
jojochuang Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...egration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
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;
Expand Down Expand Up @@ -662,7 +661,6 @@ void testWriteExactlyMaxFlushSize(boolean flushDelay, boolean enablePiggybacking

@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)) {
Expand Down
18 changes: 11 additions & 7 deletions ...t/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamWithFailures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ private static Stream<Arguments> clientParameters() {

@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)) {
Expand Down Expand Up @@ -386,7 +385,8 @@ private void testWriteMoreThanMaxFlushSize(OzoneClient client)
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());
Expand Down Expand Up @@ -442,7 +442,8 @@ private void testExceptionDuringClose(OzoneClient client) throws Exception {
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());
Expand All @@ -455,7 +456,8 @@ private void testExceptionDuringClose(OzoneClient client) throws Exception {
// 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());
Expand Down Expand Up @@ -506,9 +508,10 @@ private void testWatchForCommitWithSingleNodeRatis(OzoneClient client)
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());

Expand All @@ -531,7 +534,8 @@ private void testWatchForCommitWithSingleNodeRatis(OzoneClient client)
// 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());
Expand Down