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 15506217ac HDDS-11002. Speed up TestPipelineClose (#6804)
15506217ac is described below
commit 15506217ac40c150a6c56ec5c71f61c05f6bd376
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jun 12 10:15:15 2024 +0200
HDDS-11002. Speed up TestPipelineClose (#6804)
---
.../apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
index 858a448675..4b211191e8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java
@@ -45,9 +45,11 @@ import
org.apache.hadoop.ozone.container.common.transport.server.ratis.XceiverSe
import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.protocol.RaftGroupId;
-import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
import org.mockito.ArgumentCaptor;
@@ -70,6 +72,7 @@ import static org.mockito.Mockito.verify;
/**
* Tests for Pipeline Closing.
*/
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Timeout(300)
public class TestPipelineClose {
@@ -86,7 +89,7 @@ public class TestPipelineClose {
*
* @throws IOException
*/
- @BeforeEach
+ @BeforeAll
public void init() throws Exception {
conf = new OzoneConfiguration();
conf.set(OzoneConfigKeys.OZONE_SCM_CLOSE_CONTAINER_WAIT_DURATION, "2s");
@@ -102,12 +105,15 @@ public class TestPipelineClose {
scm = cluster.getStorageContainerManager();
containerManager = scm.getContainerManager();
pipelineManager = scm.getPipelineManager();
+ }
+
+ @BeforeEach
+ void createContainer() throws IOException {
ContainerInfo containerInfo = containerManager
.allocateContainer(RatisReplicationConfig.getInstance(
ReplicationFactor.THREE), "testOwner");
ratisContainer = new ContainerWithPipeline(containerInfo,
pipelineManager.getPipeline(containerInfo.getPipelineID()));
- pipelineManager = scm.getPipelineManager();
// At this stage, there should be 2 pipeline one with 1 open container
each.
// Try closing the both the pipelines, one with a closed container and
// the other with an open container.
@@ -116,7 +122,7 @@ public class TestPipelineClose {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterEach
+ @AfterAll
public void shutdown() {
if (cluster != null) {
cluster.shutdown();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
