This is an automated email from the ASF dual-hosted git repository.
sodonnell 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 ed30752 HDDS-5749. Reuse mini-clusters in TestOzoneFsHAURLs (#2647)
ed30752 is described below
commit ed30752158e6f40c027cdf08cb25f5d147db3805
Author: Stephen O'Donnell <[email protected]>
AuthorDate: Wed Sep 15 17:37:20 2021 +0100
HDDS-5749. Reuse mini-clusters in TestOzoneFsHAURLs (#2647)
---
.../apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 35 ++++++++++++++--------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
index 3ad3428..31cd9dc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
@@ -39,9 +39,10 @@ import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.util.ToolRunner;
import org.apache.ratis.util.LifeCycle;
import org.hamcrest.core.StringContains;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,13 +70,13 @@ public class TestOzoneFsHAURLs {
TestOzoneFsHAURLs.class);
private OzoneConfiguration conf;
- private MiniOzoneCluster cluster;
- private String omId;
- private String omServiceId;
- private String clusterId;
- private String scmId;
- private OzoneManager om;
- private int numOfOMs;
+ private static MiniOzoneCluster cluster;
+ private static String omId;
+ private static String omServiceId;
+ private static String clusterId;
+ private static String scmId;
+ private static OzoneManager om;
+ private static int numOfOMs;
private String volumeName;
private String bucketName;
@@ -86,9 +87,9 @@ public class TestOzoneFsHAURLs {
private final String o3fsImplValue =
"org.apache.hadoop.fs.ozone.OzoneFileSystem";
- @Before
- public void init() throws Exception {
- conf = new OzoneConfiguration();
+ @BeforeClass
+ public static void initClass() throws Exception {
+ OzoneConfiguration conf = new OzoneConfiguration();
omId = UUID.randomUUID().toString();
omServiceId = "om-service-test1";
numOfOMs = 3;
@@ -117,6 +118,14 @@ public class TestOzoneFsHAURLs {
cluster.waitForClusterToBeReady();
om = cluster.getOzoneManager();
+ }
+
+ @Before
+ public void init() throws Exception {
+ // Duplicate the conf for each test, so the client can change it, and each
+ // test will still get the same base conf used to start the cluster.
+ conf = new OzoneConfiguration(cluster.getConf());
+
Assert.assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
volumeName = "volume" + RandomStringUtils.randomNumeric(5);
@@ -142,8 +151,8 @@ public class TestOzoneFsHAURLs {
fs.mkdirs(dir2);
}
- @After
- public void shutdown() {
+ @AfterClass
+ public static void shutdown() {
if (cluster != null) {
cluster.shutdown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
