You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ms...@apache.org on 2021/02/17 10:56:15 UTC
[ozone] branch HDDS-2823 updated: HDDS-4829. Rename
MiniOzoneHACluster to MiniOzoneOMHACluster. (#1925)
This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new b60a230 HDDS-4829. Rename MiniOzoneHACluster to MiniOzoneOMHACluster. (#1925)
b60a230 is described below
commit b60a2306374533a616123d1f9da33e0506bac4d6
Author: Mukul Kumar Singh <ms...@apache.org>
AuthorDate: Wed Feb 17 16:26:03 2021 +0530
HDDS-4829. Rename MiniOzoneHACluster to MiniOzoneOMHACluster. (#1925)
---
.../org/apache/hadoop/ozone/MiniOzoneChaosCluster.java | 4 ++--
.../java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 6 +++---
.../java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 4 ++--
.../java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java | 2 +-
...oneHAClusterImpl.java => MiniOzoneOMHAClusterImpl.java} | 14 +++++++-------
...niOzoneHACluster.java => TestMiniOzoneOMHACluster.java} | 8 ++++----
.../org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java | 6 +++---
.../org/apache/hadoop/ozone/om/TestOzoneManagerHA.java | 8 ++++----
.../hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java | 2 +-
.../apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java | 2 +-
.../hadoop/ozone/om/parser/TestOMRatisLogParser.java | 6 +++---
.../om/snapshot/TestOzoneManagerSnapshotProvider.java | 6 +++---
.../hadoop/ozone/recon/TestReconWithOzoneManagerHA.java | 8 ++++----
.../org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 6 +++---
.../java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java | 2 +-
15 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 4401737..751777c 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
/**
* This class causes random failures in the chaos cluster.
*/
-public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
+public class MiniOzoneChaosCluster extends MiniOzoneOMHAClusterImpl {
static final Logger LOG =
LoggerFactory.getLogger(MiniOzoneChaosCluster.class);
@@ -147,7 +147,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
/**
* Builder for configuring the MiniOzoneChaosCluster to run.
*/
- public static class Builder extends MiniOzoneHAClusterImpl.Builder {
+ public static class Builder extends MiniOzoneOMHAClusterImpl.Builder {
private final Set<Class<? extends Failures>> clazzes = new HashSet<>();
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 a16e4b4..0ee3fad 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
@@ -26,7 +26,7 @@ import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
@@ -107,7 +107,7 @@ public class TestOzoneFsHAURLs {
omStore.initialize();
// Start the cluster
- cluster = MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newOMHABuilder(conf)
.setNumDatanodes(7)
.setTotalPipelineNumLimit(10)
.setClusterId(clusterId)
@@ -154,7 +154,7 @@ public class TestOzoneFsHAURLs {
* @return the leader OM's RPC address in the MiniOzoneHACluster
*/
private String getLeaderOMNodeAddr() {
- MiniOzoneHAClusterImpl haCluster = (MiniOzoneHAClusterImpl) cluster;
+ MiniOzoneOMHAClusterImpl haCluster = (MiniOzoneOMHAClusterImpl) cluster;
OzoneManager omLeader = haCluster.getOMLeader();
Assert.assertNotNull("There should be a leader OM at this point.",
omLeader);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index 87b2679..c3d9815 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -60,8 +60,8 @@ public interface MiniOzoneCluster {
*
* @return MiniOzoneCluster builder
*/
- static Builder newHABuilder(OzoneConfiguration conf) {
- return new MiniOzoneHAClusterImpl.Builder(conf);
+ static Builder newOMHABuilder(OzoneConfiguration conf) {
+ return new MiniOzoneOMHAClusterImpl.Builder(conf);
}
/**
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index c0db49f..757c6b8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -139,7 +139,7 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
/**
* Creates a new MiniOzoneCluster without the OzoneManager. This is used by
- * {@link MiniOzoneHAClusterImpl} for starting multiple OzoneManagers.
+ * {@link MiniOzoneOMHAClusterImpl} for starting multiple OzoneManagers.
*
* @param conf
* @param scm
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneOMHAClusterImpl.java
similarity index 97%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneOMHAClusterImpl.java
index ece5e71..aa40b2e 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneOMHAClusterImpl.java
@@ -50,14 +50,14 @@ import java.util.concurrent.TimeUnit;
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
/**
- * MiniOzoneHAClusterImpl creates a complete in-process Ozone cluster
+ * MiniOzoneOMHAClusterImpl creates a complete in-process Ozone cluster
* with OM HA suitable for running tests. The cluster consists of a set of
* OzoneManagers, StorageContainerManager and multiple DataNodes.
*/
-public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
+public class MiniOzoneOMHAClusterImpl extends MiniOzoneClusterImpl {
private static final Logger LOG =
- LoggerFactory.getLogger(MiniOzoneHAClusterImpl.class);
+ LoggerFactory.getLogger(MiniOzoneOMHAClusterImpl.class);
private Map<String, OzoneManager> ozoneManagerMap;
private List<OzoneManager> ozoneManagers;
@@ -79,7 +79,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
* @throws IOException if there is an I/O error
*/
@SuppressWarnings("checkstyle:ParameterNumber")
- private MiniOzoneHAClusterImpl(
+ private MiniOzoneOMHAClusterImpl(
OzoneConfiguration conf,
List<OzoneManager> activeOMList,
List<OzoneManager> inactiveOMList,
@@ -115,7 +115,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
* Creates a new MiniOzoneCluster with all OMs active.
* This is used by MiniOzoneChaosCluster.
*/
- protected MiniOzoneHAClusterImpl(
+ protected MiniOzoneOMHAClusterImpl(
OzoneConfiguration conf,
List<OzoneManager> omList,
StorageContainerManager scm,
@@ -297,7 +297,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
final List<HddsDatanodeService> hddsDatanodes = createHddsDatanodes(
scm, reconServer);
- MiniOzoneHAClusterImpl cluster = new MiniOzoneHAClusterImpl(conf,
+ MiniOzoneOMHAClusterImpl cluster = new MiniOzoneOMHAClusterImpl(conf,
activeOMs, inactiveOMs, scm, hddsDatanodes, omServiceId, reconServer);
if (startDataNodes) {
@@ -401,7 +401,7 @@ public class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
}
omList.clear();
++retryCount;
- LOG.info("MiniOzoneHACluster port conflicts, retried {} times",
+ LOG.info("MiniOzoneOMHACluster port conflicts, retried {} times",
retryCount);
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneOMHACluster.java
similarity index 93%
rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java
rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneOMHACluster.java
index 2306275..2d75c48 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneHACluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneOMHACluster.java
@@ -39,11 +39,11 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDC
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
/**
- * This class tests MiniOzoneHAClusterImpl.
+ * This class tests MiniOzoneOMHAClusterImpl.
*/
-public class TestMiniOzoneHACluster {
+public class TestMiniOzoneOMHACluster {
- private MiniOzoneHAClusterImpl cluster = null;
+ private MiniOzoneOMHAClusterImpl cluster = null;
private OzoneConfiguration conf;
private String clusterId;
private String scmId;
@@ -71,7 +71,7 @@ public class TestMiniOzoneHACluster {
conf.set(OzoneConfigKeys.OZONE_ADMINISTRATORS,
OZONE_ADMINISTRATORS_WILDCARD);
conf.setInt(OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS, 2);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
index d44600f..8b50c6d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
@@ -57,7 +57,7 @@ import org.slf4j.event.Level;
@Timeout(500)
public class TestOMRatisSnapshots {
- private MiniOzoneHAClusterImpl cluster = null;
+ private MiniOzoneOMHAClusterImpl cluster = null;
private ObjectStore objectStore;
private OzoneConfiguration conf;
private String clusterId;
@@ -88,7 +88,7 @@ public class TestOMRatisSnapshots {
conf.setLong(
OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY,
SNAPSHOT_THRESHOLD);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId("om-service-test1")
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
index d60366c..8cf0f5e 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
@@ -22,7 +22,7 @@ import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneBucket;
@@ -68,7 +68,7 @@ import static org.junit.Assert.fail;
*/
public abstract class TestOzoneManagerHA {
- private MiniOzoneHAClusterImpl cluster = null;
+ private MiniOzoneOMHAClusterImpl cluster = null;
private ObjectStore objectStore;
private OzoneConfiguration conf;
private String clusterId;
@@ -88,7 +88,7 @@ public abstract class TestOzoneManagerHA {
@Rule
public Timeout timeout = new Timeout(300_000);
- public MiniOzoneHAClusterImpl getCluster() {
+ public MiniOzoneOMHAClusterImpl getCluster() {
return cluster;
}
@@ -164,7 +164,7 @@ public abstract class TestOzoneManagerHA {
*/
conf.set(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, "10s");
conf.set(OZONE_KEY_DELETING_LIMIT_PER_TASK, "2");
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
index 84a1b17..3699685 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
@@ -62,7 +62,7 @@ import java.util.TreeSet;
import java.util.Iterator;
import java.util.UUID;
-import static org.apache.hadoop.ozone.MiniOzoneHAClusterImpl.NODE_FAILURE_TIMEOUT;
+import static org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl.NODE_FAILURE_TIMEOUT;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_WAIT_BETWEEN_RETRIES_MILLIS_DEFAULT;
import static org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRICS;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
index 9c8e5b9..c02ceca 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithData.java
@@ -46,7 +46,7 @@ import java.util.Map;
import java.util.UUID;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.hadoop.ozone.MiniOzoneHAClusterImpl.NODE_FAILURE_TIMEOUT;
+import static org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl.NODE_FAILURE_TIMEOUT;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.DIRECTORY_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FILE_ALREADY_EXISTS;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NOT_A_FILE;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java
index 1aeb3e4..4ec4597 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/parser/TestOMRatisLogParser.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ozone.om.parser;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.om.helpers.OMRatisHelper;
@@ -52,7 +52,7 @@ public class TestOMRatisLogParser {
@Rule
public Timeout timeout = new Timeout(300000);
- private MiniOzoneHAClusterImpl cluster = null;
+ private MiniOzoneOMHAClusterImpl cluster = null;
private final ByteArrayOutputStream out = new ByteArrayOutputStream();
private final ByteArrayOutputStream err = new ByteArrayOutputStream();
@@ -62,7 +62,7 @@ public class TestOMRatisLogParser {
String scmId = UUID.randomUUID().toString();
String omServiceId = "omServiceId1";
OzoneConfiguration conf = new OzoneConfiguration();
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
index ed9ef72..4541d75 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.OzoneVolume;
@@ -47,7 +47,7 @@ import org.junit.rules.Timeout;
*/
public class TestOzoneManagerSnapshotProvider {
- private MiniOzoneHAClusterImpl cluster = null;
+ private MiniOzoneOMHAClusterImpl cluster = null;
private ObjectStore objectStore;
private OzoneConfiguration conf;
private String clusterId;
@@ -69,7 +69,7 @@ public class TestOzoneManagerSnapshotProvider {
omServiceId = "om-service-test1";
conf.setBoolean(OMConfigKeys.OZONE_OM_HTTP_ENABLED_KEY, true);
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
index 64c759b..31f3d34 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hdds.utils.db.RocksDBConfiguration;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
@@ -49,13 +49,13 @@ import org.junit.Test;
import org.junit.rules.Timeout;
/**
- * This class sets up a MiniOzoneHACluster to test with Recon.
+ * This class sets up a MiniOzoneOMHACluster to test with Recon.
*/
public class TestReconWithOzoneManagerHA {
@Rule
public Timeout timeout = new Timeout(300_000);
- private MiniOzoneHAClusterImpl cluster;
+ private MiniOzoneOMHAClusterImpl cluster;
private ObjectStore objectStore;
private static final String OM_SERVICE_ID = "omService1";
private static final String VOL_NAME = "testrecon";
@@ -70,7 +70,7 @@ public class TestReconWithOzoneManagerHA {
dbConf.setSyncOption(true);
conf.setFromObject(dbConf);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = (MiniOzoneOMHAClusterImpl) MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(UUID.randomUUID().toString())
.setScmId(UUID.randomUUID().toString())
.setOMServiceId(OM_SERVICE_ID)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index f6b41aa..6aa35fa 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.ozone.OFSPath;
import org.apache.hadoop.fs.ozone.OzoneFsShell;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.ha.ConfUtils;
@@ -127,7 +127,7 @@ public class TestOzoneShellHA {
numOfOMs = 3;
clusterId = UUID.randomUUID().toString();
scmId = UUID.randomUUID().toString();
- cluster = MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
@@ -228,7 +228,7 @@ public class TestOzoneShellHA {
* @return the leader OM's Node ID in the MiniOzoneHACluster.
*/
private String getLeaderOMNodeId() {
- MiniOzoneHAClusterImpl haCluster = (MiniOzoneHAClusterImpl) cluster;
+ MiniOzoneOMHAClusterImpl haCluster = (MiniOzoneOMHAClusterImpl) cluster;
OzoneManager omLeader = haCluster.getOMLeader();
Assert.assertNotNull("There should be a leader OM at this point.",
omLeader);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java
index 02f8815..16c664c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestScmAdminHA.java
@@ -50,7 +50,7 @@ public class TestScmAdminHA {
numOfOMs = 3;
clusterId = UUID.randomUUID().toString();
scmId = UUID.randomUUID().toString();
- cluster = MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newOMHABuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId(omServiceId)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org