You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by er...@apache.org on 2023/02/02 17:21:50 UTC
[ozone] branch master updated: HDDS-5626. Mark parts of TestAddRemoveOzoneManager, TestBlockOutputStreamFlushDelay and TestFailureHandlingByClient as flaky (#4240)
This is an automated email from the ASF dual-hosted git repository.
erose 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 22f38d6f0c HDDS-5626. Mark parts of TestAddRemoveOzoneManager, TestBlockOutputStreamFlushDelay and TestFailureHandlingByClient as flaky (#4240)
22f38d6f0c is described below
commit 22f38d6f0cf91e19fd3990ad73c6145c8c6fffc3
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu Feb 2 18:21:42 2023 +0100
HDDS-5626. Mark parts of TestAddRemoveOzoneManager, TestBlockOutputStreamFlushDelay and TestFailureHandlingByClient as flaky (#4240)
---
.../ozone/client/rpc/TestBlockOutputStream.java | 24 +++++++++++-----------
.../rpc/TestBlockOutputStreamFlushDelay.java | 24 +++++++++++-----------
.../client/rpc/TestFailureHandlingByClient.java | 2 ++
.../hadoop/ozone/om/TestAddRemoveOzoneManager.java | 1 +
4 files changed, 27 insertions(+), 24 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 b142e928ab..f99ea72ff7 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
@@ -44,23 +44,20 @@ import org.apache.hadoop.ozone.container.TestHelper;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import org.junit.AfterClass;
+
+import org.apache.ozone.test.tag.Flaky;
+import org.junit.jupiter.api.AfterAll;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* Tests BlockOutputStream class.
*/
+@Timeout(300)
public class TestBlockOutputStream {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public Timeout timeout = Timeout.seconds(300);
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf = new OzoneConfiguration();
private static OzoneClient client;
@@ -80,7 +77,7 @@ public class TestBlockOutputStream {
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
chunkSize = 100;
flushSize = 2 * chunkSize;
@@ -124,7 +121,7 @@ public class TestBlockOutputStream {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
if (cluster != null) {
cluster.shutdown();
@@ -326,6 +323,7 @@ public class TestBlockOutputStream {
}
@Test
+ @Flaky("HDDS-7875")
public void testMultiChunkWrite() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
@@ -421,6 +419,7 @@ public class TestBlockOutputStream {
}
@Test
+ @Flaky("HDDS-7875")
public void testMultiChunkWrite2() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
@@ -497,6 +496,7 @@ public class TestBlockOutputStream {
}
@Test
+ @Flaky("HDDS-7875")
public void testFullBufferCondition() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java
index fcd0fa4274..8ca49631e9 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestBlockOutputStreamFlushDelay.java
@@ -39,26 +39,23 @@ import org.apache.hadoop.ozone.client.io.KeyOutputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
+import org.apache.ozone.test.tag.Flaky;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import org.junit.AfterClass;
+
+import org.junit.jupiter.api.AfterAll;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* Tests TestBlockOutputStreamFlushDelay class.
*/
+@Timeout(300)
public class TestBlockOutputStreamFlushDelay {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public Timeout timeout = Timeout.seconds(300);
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf = new OzoneConfiguration();
private static OzoneClient client;
@@ -78,7 +75,7 @@ public class TestBlockOutputStreamFlushDelay {
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
chunkSize = 100;
flushSize = 2 * chunkSize;
@@ -116,7 +113,7 @@ public class TestBlockOutputStreamFlushDelay {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
if (cluster != null) {
cluster.shutdown();
@@ -324,6 +321,7 @@ public class TestBlockOutputStreamFlushDelay {
}
@Test
+ @Flaky("HDDS-7875")
public void testMultiChunkWrite() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
@@ -419,6 +417,7 @@ public class TestBlockOutputStreamFlushDelay {
}
@Test
+ @Flaky("HDDS-7875")
public void testMultiChunkWrite2() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
@@ -495,6 +494,7 @@ public class TestBlockOutputStreamFlushDelay {
}
@Test
+ @Flaky("HDDS-7875")
public void testFullBufferCondition() throws Exception {
XceiverClientMetrics metrics =
XceiverClientManager.getXceiverClientMetrics();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
index 7ddb6e13d3..a36c779dbd 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
@@ -163,6 +163,7 @@ public class TestFailureHandlingByClient {
}
@Test
+ @Flaky("HDDS-7877")
public void testBlockWritesWithDnFailures() throws Exception {
startCluster();
String keyName = UUID.randomUUID().toString();
@@ -352,6 +353,7 @@ public class TestFailureHandlingByClient {
@Test
+ @Flaky("HDDS-7878")
public void testContainerExclusionWithClosedContainerException()
throws Exception {
startCluster();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
index 0fe95596e8..8a860c1aa8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
@@ -169,6 +169,7 @@ public class TestAddRemoveOzoneManager {
* OM.
*/
@Test
+ @Flaky("HDDS-7880")
public void testBootstrap() throws Exception {
setupCluster(1);
OzoneManager oldOM = cluster.getOzoneManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org