Skip to content

HDDS-5749. Reuse mini-clusters in TestOzoneFsHAURLs #2647

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
sodonnel merged 1 commit into from
Sep 15, 2021
Merged

HDDS-5749. Reuse mini-clusters in TestOzoneFsHAURLs #2647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions ...op-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -117,6 +118,14 @@ public void init() throws Exception {
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);
Expand All @@ -142,8 +151,8 @@ public void init() throws Exception {
fs.mkdirs(dir2);
}

@After
public void shutdown() {
@AfterClass
public static void shutdown() {
if (cluster != null) {
cluster.shutdown();
}
Expand Down