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 804366a0f0 HDDS-6713. Avoid the need to cast to MiniOzoneHAClusterImpl
(#6295)
804366a0f0 is described below
commit 804366a0f0a2ac28365812c5d325f5a1df108bf7
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Feb 29 11:14:21 2024 +0100
HDDS-6713. Avoid the need to cast to MiniOzoneHAClusterImpl (#6295)
---
.../java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java | 13 ++++++-------
.../org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java | 2 +-
.../hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java | 2 +-
.../org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java | 5 +++--
.../java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java | 4 ++--
.../hadoop/hdds/scm/TestStorageContainerManagerHA.java | 2 +-
.../org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java | 5 ++---
.../apache/hadoop/hdds/upgrade/TestScmHAFinalization.java | 7 +++----
.../org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java | 2 +-
.../test/java/org/apache/hadoop/ozone/TestBlockTokens.java | 4 ++--
.../java/org/apache/hadoop/ozone/TestBlockTokensCLI.java | 4 ++--
.../org/apache/hadoop/ozone/TestMultipartObjectGet.java | 4 ++--
.../ozone/container/metrics/TestDatanodeQueueMetrics.java | 8 ++++----
.../apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java | 2 +-
.../apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java | 8 ++++----
.../org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java | 2 +-
.../apache/hadoop/ozone/om/TestOMUpgradeFinalization.java | 8 ++++----
.../org/apache/hadoop/ozone/om/TestOmSnapshotDisabled.java | 5 ++---
.../hadoop/ozone/om/TestOmSnapshotDisabledRestart.java | 2 +-
.../org/apache/hadoop/ozone/om/TestOzoneManagerHA.java | 9 ++-------
.../apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java | 2 +-
.../hadoop/ozone/om/TestSnapshotBackgroundServices.java | 2 +-
.../om/snapshot/TestOzoneManagerSnapshotProvider.java | 2 +-
.../hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java | 4 ++--
.../hadoop/ozone/parser/TestOzoneHARatisLogParser.java | 2 +-
.../hadoop/ozone/recon/TestReconWithOzoneManagerHA.java | 8 ++++----
.../hadoop/ozone/shell/TestDeletedBlocksTxnShell.java | 2 +-
.../org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 13 ++++++-------
.../apache/hadoop/ozone/shell/TestOzoneTenantShell.java | 14 ++++++--------
.../hadoop/ozone/shell/TestTransferLeadershipShell.java | 2 +-
30 files changed, 69 insertions(+), 80 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 6f3a9bb5a1..4f14ede8fa 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
@@ -72,7 +72,7 @@ public class TestOzoneFsHAURLs {
TestOzoneFsHAURLs.class);
private OzoneConfiguration conf;
- private static MiniOzoneCluster cluster;
+ private static MiniOzoneHAClusterImpl cluster;
private static String omServiceId;
private static OzoneManager om;
private static int numOfOMs;
@@ -107,11 +107,11 @@ public class TestOzoneFsHAURLs {
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS, true);
// Start the cluster
- cluster = MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(omServiceId)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs)
- .setNumDatanodes(5)
- .build();
+ .setNumDatanodes(5);
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
client = OzoneClientFactory.getRpcClient(omServiceId, conf);
@@ -160,8 +160,7 @@ public class TestOzoneFsHAURLs {
* @return the leader OM's RPC address in the MiniOzoneHACluster
*/
private String getLeaderOMNodeAddr() {
- MiniOzoneHAClusterImpl haCluster = (MiniOzoneHAClusterImpl) cluster;
- OzoneManager omLeader = haCluster.getOMLeader();
+ OzoneManager omLeader = cluster.getOMLeader();
assertNotNull(omLeader, "There should be a leader OM at this point.");
String omNodeId = omLeader.getOMNodeId();
// omLeaderAddrKey=ozone.om.address.omServiceId.omNodeId
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
index 688d13ad36..9db501edb7 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
@@ -84,7 +84,7 @@ public class TestFailoverWithSCMHA {
conf.setLong(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD,
SNAPSHOT_THRESHOLD);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId).setNumOfOzoneManagers(numOfOMs)
.setNumOfStorageContainerManagers(numOfSCMs).setNumOfActiveSCMs(3)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
index 0aa2599637..1049273614 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
@@ -94,7 +94,7 @@ public class TestSCMInstallSnapshotWithHA {
conf.setLong(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD,
SNAPSHOT_THRESHOLD);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId)
.setNumOfOzoneManagers(numOfOMs)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
index ebd68eb13e..4cfc64cd4f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
@@ -118,7 +118,8 @@ public final class TestSecretKeySnapshot {
conf.set(HDDS_SECRET_KEY_ROTATE_DURATION, ROTATE_DURATION_MS + "ms");
conf.set(HDDS_SECRET_KEY_EXPIRY_DURATION, EXPIRY_DURATION_MS + "ms");
- MiniOzoneCluster.Builder builder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder
.setSCMServiceId("TestSecretKeySnapshot")
.setSCMServiceId("SCMServiceId")
.setNumOfStorageContainerManagers(3)
@@ -126,7 +127,7 @@ public final class TestSecretKeySnapshot {
.setNumOfOzoneManagers(1)
.setNumDatanodes(1);
- cluster = (MiniOzoneHAClusterImpl) builder.build();
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
index 405534af95..6af43c3bac 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
@@ -326,12 +326,12 @@ public final class TestSecretKeysApi {
private void startCluster(int numSCMs)
throws IOException, TimeoutException, InterruptedException {
OzoneManager.setTestSecureOmFlag(true);
- MiniOzoneCluster.Builder builder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId("TestSecretKey")
.setNumOfStorageContainerManagers(numSCMs)
.setNumOfOzoneManagers(1);
- cluster = (MiniOzoneHAClusterImpl) builder.build();
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHA.java
index e62820cfb1..2986484d2a 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHA.java
@@ -95,7 +95,7 @@ public class TestStorageContainerManagerHA {
conf.set(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_GAP, "1");
omServiceId = "om-service-test1";
scmServiceId = "scm-service-test1";
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId)
.setNumOfStorageContainerManagers(numOfSCMs)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
index 33c09e2ce8..62e3b6321e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestHDDSUpgrade.java
@@ -166,9 +166,8 @@ public class TestHDDSUpgrade {
SCMConfigurator scmConfigurator = new SCMConfigurator();
scmConfigurator.setUpgradeFinalizationExecutor(scmFinalizationExecutor);
- MiniOzoneCluster.Builder builder =
- new MiniOzoneHAClusterImpl.Builder(conf)
- .setNumOfStorageContainerManagers(NUM_SCMS)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setNumOfStorageContainerManagers(NUM_SCMS)
.setSCMConfigurator(scmConfigurator)
.setNumDatanodes(NUM_DATA_NODES)
.setDatanodeFactory(UniformDatanodesFactory.newBuilder()
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
index da63a7de6b..d5802aab6e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmHAFinalization.java
@@ -91,9 +91,8 @@ public class TestScmHAFinalization {
conf.setInt(HDDS_SCM_INIT_DEFAULT_LAYOUT_VERSION,
HDDSLayoutFeature.INITIAL_VERSION.layoutVersion());
- MiniOzoneCluster.Builder clusterBuilder =
- new MiniOzoneHAClusterImpl.Builder(conf)
- .setNumOfStorageContainerManagers(NUM_SCMS)
+ MiniOzoneHAClusterImpl.Builder clusterBuilder =
MiniOzoneCluster.newHABuilder(conf);
+ clusterBuilder.setNumOfStorageContainerManagers(NUM_SCMS)
.setNumOfActiveSCMs(NUM_SCMS - numInactiveSCMs)
.setSCMServiceId("scmservice")
.setNumOfOzoneManagers(1)
@@ -102,7 +101,7 @@ public class TestScmHAFinalization {
.setDatanodeFactory(UniformDatanodesFactory.newBuilder()
.setLayoutVersion(HDDSLayoutFeature.INITIAL_VERSION.layoutVersion())
.build());
- this.cluster = (MiniOzoneHAClusterImpl) clusterBuilder.build();
+ this.cluster = clusterBuilder.build();
scmClient = cluster.getStorageContainerLocationClient();
cluster.waitForClusterToBeReady();
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/MiniOzoneHAClusterImpl.java
index c33307c690..8746e77c9e 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/MiniOzoneHAClusterImpl.java
@@ -392,7 +392,7 @@ public class MiniOzoneHAClusterImpl extends
MiniOzoneClusterImpl {
}
@Override
- public MiniOzoneCluster build() throws IOException {
+ public MiniOzoneHAClusterImpl build() throws IOException {
if (numOfActiveOMs > numOfOMs) {
throw new IllegalArgumentException("Number of active OMs cannot be " +
"more than the total number of OMs");
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
index 9d05b54be8..0b5dab36d3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
@@ -378,12 +378,12 @@ public final class TestBlockTokens {
private static void startCluster()
throws IOException, TimeoutException, InterruptedException {
OzoneManager.setTestSecureOmFlag(true);
- MiniOzoneCluster.Builder builder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId("TestSecretKey")
.setNumOfStorageContainerManagers(3)
.setNumOfOzoneManagers(1);
- cluster = (MiniOzoneHAClusterImpl) builder.build();
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
index a42fbf2e86..87242cb279 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
@@ -318,13 +318,13 @@ public final class TestBlockTokensCLI {
private static void startCluster()
throws IOException, TimeoutException, InterruptedException {
OzoneManager.setTestSecureOmFlag(true);
- MiniOzoneCluster.Builder builder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId(scmServiceId)
.setOMServiceId(omServiceId)
.setNumOfStorageContainerManagers(3)
.setNumOfOzoneManagers(3);
- cluster = (MiniOzoneHAClusterImpl) builder.build();
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMultipartObjectGet.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMultipartObjectGet.java
index 0d0acfbd8c..daeb3a7b2d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMultipartObjectGet.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMultipartObjectGet.java
@@ -103,12 +103,12 @@ public class TestMultipartObjectGet {
private static void startCluster()
throws IOException, TimeoutException, InterruptedException {
OzoneManager.setTestSecureOmFlag(true);
- MiniOzoneCluster.Builder builder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId(scmServiceId)
.setOMServiceId(omServiceId)
.setNumOfStorageContainerManagers(3)
.setNumOfOzoneManagers(3);
- cluster = (MiniOzoneHAClusterImpl) builder.build();
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestDatanodeQueueMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestDatanodeQueueMetrics.java
index a1d436b336..2f18326f7b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestDatanodeQueueMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestDatanodeQueueMetrics.java
@@ -67,13 +67,13 @@ public class TestDatanodeQueueMetrics {
conf.set(ScmConfigKeys.OZONE_SCM_PIPELINE_CREATION_INTERVAL, "10s");
omServiceId = "om-service-test1";
scmServiceId = "scm-service-test1";
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(omServiceId)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId)
.setNumOfStorageContainerManagers(numOfSCMs)
.setNumOfOzoneManagers(numOfOMs)
- .setNumDatanodes(1)
- .build();
+ .setNumDatanodes(1);
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
/**
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 9d4d489586..ff57a1e7bb 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
@@ -95,7 +95,7 @@ public class TestAddRemoveOzoneManager {
private void setupCluster(int numInitialOMs) throws Exception {
conf = new OzoneConfiguration();
conf.setInt(OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY, 5);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId(SCM_DUMMY_SERVICE_ID)
.setOMServiceId(OM_SERVICE_ID)
.setNumOfOzoneManagers(numInitialOMs)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java
index 4b1fa81734..ae97b3f7b9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java
@@ -94,11 +94,11 @@ class TestOMBucketLayoutUpgrade {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setInt(OZONE_OM_INIT_DEFAULT_LAYOUT_VERSION, fromLayoutVersion);
String omServiceId = UUID.randomUUID().toString();
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(omServiceId)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(3)
- .setNumDatanodes(1)
- .build();
+ .setNumDatanodes(1);
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
ozoneManager = cluster.getOzoneManager();
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 a42b9ce469..42708b0b16 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
@@ -155,7 +155,7 @@ public class TestOMRatisSnapshots {
omRatisConf.setLogAppenderWaitTimeMin(10);
conf.setFromObject(omRatisConf);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId("om-service-test1")
.setNumOfOzoneManagers(numOfOMs)
.setNumOfActiveOMs(2)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java
index 716348e65a..ccf94bef3c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java
@@ -105,11 +105,11 @@ class TestOMUpgradeFinalization {
private static MiniOzoneHAClusterImpl newCluster(OzoneConfiguration conf)
throws IOException {
conf.setInt(OZONE_OM_INIT_DEFAULT_LAYOUT_VERSION,
INITIAL_VERSION.layoutVersion());
- return (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(UUID.randomUUID().toString())
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(UUID.randomUUID().toString())
.setNumOfOzoneManagers(3)
- .setNumDatanodes(1)
- .build();
+ .setNumDatanodes(1);
+ return builder.build();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabled.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabled.java
index 37ec1a3247..df9a4ddfe2 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabled.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabled.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
*/
public class TestOmSnapshotDisabled {
- private static MiniOzoneCluster cluster = null;
+ private static MiniOzoneHAClusterImpl cluster = null;
private static OzoneClient client;
private static ObjectStore store;
@@ -64,8 +64,7 @@ public class TestOmSnapshotDisabled {
cluster.waitForClusterToBeReady();
client = cluster.newClient();
- OzoneManager leaderOzoneManager =
- ((MiniOzoneHAClusterImpl) cluster).getOMLeader();
+ OzoneManager leaderOzoneManager = cluster.getOMLeader();
OzoneConfiguration leaderConfig = leaderOzoneManager.getConfiguration();
cluster.setConf(leaderConfig);
store = client.getObjectStore();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabledRestart.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabledRestart.java
index 4b84f5c925..8a5ae02349 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabledRestart.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotDisabledRestart.java
@@ -54,7 +54,7 @@ public class TestOmSnapshotDisabledRestart {
// Enable filesystem snapshot feature at the beginning
conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId("om-service-test2")
.setNumOfOzoneManagers(3)
.build();
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 091cd6fb1e..2c6ab49b21 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
@@ -76,7 +76,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public abstract class TestOzoneManagerHA {
private static MiniOzoneHAClusterImpl cluster = null;
- private static MiniOzoneCluster.Builder clusterBuilder = null;
private static ObjectStore objectStore;
private static OzoneConfiguration conf;
private static String omServiceId;
@@ -106,10 +105,6 @@ public abstract class TestOzoneManagerHA {
return conf;
}
- public MiniOzoneCluster.Builder getClusterBuilder() {
- return clusterBuilder;
- }
-
public String getOmServiceId() {
return omServiceId;
}
@@ -177,11 +172,11 @@ public abstract class TestOzoneManagerHA {
conf.set(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, "10s");
conf.set(OZONE_KEY_DELETING_LIMIT_PER_TASK, "2");
- clusterBuilder = MiniOzoneCluster.newHABuilder(conf)
+ MiniOzoneHAClusterImpl.Builder clusterBuilder =
MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs);
- cluster = (MiniOzoneHAClusterImpl) clusterBuilder.build();
+ cluster = clusterBuilder.build();
cluster.waitForClusterToBeReady();
client = OzoneClientFactory.getRpcClient(omServiceId, conf);
objectStore = client.getObjectStore();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
index 11f655ae5f..14826a1861 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
@@ -70,7 +70,7 @@ public class TestOzoneManagerHASnapshot {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId("om-service-test")
.setNumOfOzoneManagers(3)
.build();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotBackgroundServices.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotBackgroundServices.java
index c3a9c075d1..54ee0ed537 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotBackgroundServices.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotBackgroundServices.java
@@ -151,7 +151,7 @@ public class TestSnapshotBackgroundServices {
OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY,
SNAPSHOT_THRESHOLD);
int numOfOMs = 3;
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId("om-service-test1")
.setNumOfOzoneManagers(numOfOMs)
.setNumOfActiveOMs(2)
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 c91cc29a8d..d28f25a28f 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
@@ -66,7 +66,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 = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs)
.build();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java
index 226e707f33..a88290bfb8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneSnapshotRestore.java
@@ -72,7 +72,7 @@ import static
org.junit.jupiter.params.provider.Arguments.arguments;
@Timeout(value = 300)
public class TestOzoneSnapshotRestore {
private static final String OM_SERVICE_ID = "om-service-test-1";
- private MiniOzoneCluster cluster;
+ private MiniOzoneHAClusterImpl cluster;
private ObjectStore store;
private OzoneManager leaderOzoneManager;
private OzoneConfiguration clientConf;
@@ -111,7 +111,7 @@ public class TestOzoneSnapshotRestore {
.build();
cluster.waitForClusterToBeReady();
- leaderOzoneManager = ((MiniOzoneHAClusterImpl) cluster).getOMLeader();
+ leaderOzoneManager = cluster.getOMLeader();
OzoneConfiguration leaderConfig = leaderOzoneManager.getConfiguration();
cluster.setConf(leaderConfig);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/parser/TestOzoneHARatisLogParser.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/parser/TestOzoneHARatisLogParser.java
index 8f11941fcb..dff4cd046c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/parser/TestOzoneHARatisLogParser.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/parser/TestOzoneHARatisLogParser.java
@@ -66,7 +66,7 @@ class TestOzoneHARatisLogParser {
String omServiceId = "omServiceId1";
OzoneConfiguration conf = new OzoneConfiguration();
String scmServiceId = "scmServiceId";
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId)
.setNumOfOzoneManagers(3)
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 4ba546c47d..0d7cb5fbf0 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
@@ -73,12 +73,12 @@ public class TestReconWithOzoneManagerHA {
dbConf.setSyncOption(true);
conf.setFromObject(dbConf);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(OM_SERVICE_ID)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(OM_SERVICE_ID)
.setNumOfOzoneManagers(3)
.setNumDatanodes(1)
- .includeRecon(true)
- .build();
+ .includeRecon(true);
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
client = OzoneClientFactory.getRpcClient(OM_SERVICE_ID, conf);
objectStore = client.getObjectStore();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestDeletedBlocksTxnShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestDeletedBlocksTxnShell.java
index 8bb6313cf7..6f6c5439d8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestDeletedBlocksTxnShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestDeletedBlocksTxnShell.java
@@ -96,7 +96,7 @@ public class TestDeletedBlocksTxnShell {
conf.setBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, true);
conf.setInt(OZONE_SCM_BLOCK_DELETION_MAX_RETRY, 20);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setSCMServiceId(scmServiceId)
.setNumOfStorageContainerManagers(numOfSCMs)
.setNumOfActiveSCMs(numOfSCMs)
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 00450985f1..ba36fa1d97 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
@@ -128,7 +128,7 @@ public class TestOzoneShellHA {
private static File baseDir;
private static File testFile;
private static String testFilePathString;
- private static MiniOzoneCluster cluster = null;
+ private static MiniOzoneHAClusterImpl cluster = null;
private static File testDir;
private static MiniKMS miniKMS;
private static OzoneClient client;
@@ -184,11 +184,11 @@ public class TestOzoneShellHA {
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
getKeyProviderURI(miniKMS));
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS, true);
- cluster = MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(omServiceId)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs)
- .setNumDatanodes(numDNs)
- .build();
+ .setNumDatanodes(numDNs);
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
client = cluster.newClient();
}
@@ -285,8 +285,7 @@ public class TestOzoneShellHA {
* @return the leader OM's Node ID in the MiniOzoneHACluster.
*/
private String getLeaderOMNodeId() {
- MiniOzoneHAClusterImpl haCluster = (MiniOzoneHAClusterImpl) cluster;
- OzoneManager omLeader = haCluster.getOMLeader();
+ OzoneManager omLeader = cluster.getOMLeader();
assertNotNull(omLeader, "There should be a leader OM at this point.");
return omLeader.getOMNodeId();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
index 548a8832be..703848130f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneTenantShell.java
@@ -96,8 +96,7 @@ public class TestOzoneTenantShell {
private static final File AUDIT_LOG_FILE = new File("audit.log");
private static OzoneConfiguration conf = null;
- private static MiniOzoneCluster cluster = null;
- private static MiniOzoneHAClusterImpl haCluster = null;
+ private static MiniOzoneHAClusterImpl cluster = null;
private static OzoneShell ozoneSh = null;
private static TenantShell tenantShell = null;
@@ -153,12 +152,11 @@ public class TestOzoneTenantShell {
// Init cluster
omServiceId = "om-service-test1";
numOfOMs = 3;
- cluster = MiniOzoneCluster.newHABuilder(conf)
- .setOMServiceId(omServiceId)
+ MiniOzoneHAClusterImpl.Builder builder =
MiniOzoneCluster.newHABuilder(conf);
+ builder.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs)
- .withoutDatanodes() // Remove this once we are actually writing data
- .build();
- haCluster = (MiniOzoneHAClusterImpl) cluster;
+ .withoutDatanodes(); // Remove this once we are actually writing data
+ cluster = builder.build();
cluster.waitForClusterToBeReady();
}
@@ -641,7 +639,7 @@ public class TestOzoneTenantShell {
// Because InMemoryMultiTenantAccessController is used in OMs for this
// integration test, we need to trigger BG sync on all OMs just
// in case a leader changed right after the last operation.
- haCluster.getOzoneManagersList().forEach(om -> om.getMultiTenantManager()
+ cluster.getOzoneManagersList().forEach(om -> om.getMultiTenantManager()
.getOMRangerBGSyncService().triggerRangerSyncOnce());
// Delete dev volume should fail because the volume reference count > 0L
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
index 62d50708c8..d3d7c7766e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestTransferLeadershipShell.java
@@ -66,7 +66,7 @@ public class TestTransferLeadershipShell {
conf.setLong(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD,
SNAPSHOT_THRESHOLD);
- cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
+ cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setSCMServiceId(scmServiceId).setNumOfOzoneManagers(numOfOMs)
.setNumOfStorageContainerManagers(numOfSCMs)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
