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 e8aea7c07d HDDS-11892. Remove config from SCM for disabling Ratis.
(#7711)
e8aea7c07d is described below
commit e8aea7c07d042cee1232a971c20aaeba57a957bb
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Sun Jan 26 14:22:53 2025 +0530
HDDS-11892. Remove config from SCM for disabling Ratis. (#7711)
---
.../hadoop/hdds/conf/DefaultConfigManager.java | 2 ++
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 8 ------
.../org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java | 12 ++++----
.../upgrade/VersionedDatanodeFeatures.java | 6 ++--
.../hadoop/hdds/scm/ha/SCMHANodeDetails.java | 33 ++--------------------
.../hdds/scm/server/StorageContainerManager.java | 7 ++---
.../ScmHAUnfinalizedStateValidationAction.java | 6 ++--
.../dev-support/intellij/ozone-site-ha.xml | 4 ---
hadoop-ozone/dev-support/intellij/ozone-site.xml | 4 ---
.../src/main/compose/ozone-balancer/docker-config | 1 -
.../dist/src/main/compose/ozone-ha/docker-config | 1 -
.../src/main/compose/ozonesecure-ha/docker-config | 1 -
.../main/compose/upgrade/compose/ha/docker-config | 1 -
.../k8s/definitions/ozone/definitions/om-ha.yaml | 1 -
.../k8s/definitions/ozone/definitions/scm-ha.yaml | 1 -
.../k8s/examples/ozone-ha/config-configmap.yaml | 1 -
.../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 1 -
.../hadoop/ozone/TestOzoneConfigurationFields.java | 1 -
18 files changed, 18 insertions(+), 73 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DefaultConfigManager.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DefaultConfigManager.java
index 5b883e8b2c..b7577377a4 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DefaultConfigManager.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DefaultConfigManager.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.conf;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hdds.scm.ha.SCMHAUtils;
import java.util.HashMap;
import java.util.Map;
@@ -53,6 +54,7 @@ public static <T> void forceUpdateConfigValue(String config,
T value) {
@VisibleForTesting
public static void clearDefaultConfigs() {
+ SCMHAUtils.setRatisEnabled(true);
CONFIG_DEFAULT_MAP.clear();
}
}
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index 85c82af942..654038b57a 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -480,14 +480,6 @@ public final class ScmConfigKeys {
public static final String HDDS_TRACING_ENABLED = "hdds.tracing.enabled";
public static final boolean HDDS_TRACING_ENABLED_DEFAULT = false;
- // SCM Ratis related
- public static final String OZONE_SCM_HA_ENABLE_KEY
- = "ozone.scm.ratis.enable";
- /** Default Value would be Overriden based on the current state of Ratis.
- {@link org.apache.hadoop.hdds.conf.DefaultConfigManager}
- */
- public static final boolean OZONE_SCM_HA_ENABLE_DEFAULT
- = true;
public static final String OZONE_SCM_RATIS_PORT_KEY
= "ozone.scm.ratis.port";
public static final int OZONE_SCM_RATIS_PORT_DEFAULT
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
index b71adb7099..74db62768d 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
@@ -25,7 +25,6 @@
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationException;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.ratis.ServerNotLeaderException;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
@@ -87,11 +86,14 @@ private SCMHAUtils() {
// not used
}
- // Check if SCM HA is enabled.
+ // This will be removed in follow-up Jira. Ref. HDDS-11754
+ private static boolean isRatisEnabled = true;
public static boolean isSCMHAEnabled(ConfigurationSource conf) {
- return conf.getBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- DefaultConfigManager.getValue(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_DEFAULT));
+ return isRatisEnabled;
+ }
+
+ public static void setRatisEnabled(boolean value) {
+ isRatisEnabled = value;
}
public static String getPrimordialSCM(ConfigurationSource conf) {
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
index 5f52191e36..a46d9ab317 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/VersionedDatanodeFeatures.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ozone.container.upgrade;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.scm.ha.SCMHAUtils;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -117,9 +117,7 @@ public static String chooseContainerPathID(StorageVolume
volume,
*/
public static String chooseContainerPathID(ConfigurationSource conf,
String scmID, String clusterID) {
- boolean scmHAEnabled =
- conf.getBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_DEFAULT);
+ boolean scmHAEnabled = SCMHAUtils.isSCMHAEnabled(conf);
if (isFinalized(HDDSLayoutFeature.SCM_HA) || scmHAEnabled) {
return clusterID;
} else {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
index 0c90987f0c..b21a183051 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHANodeDetails.java
@@ -18,8 +18,6 @@
package org.apache.hadoop.hdds.scm.ha;
import com.google.common.base.Preconditions;
-import org.apache.hadoop.hdds.conf.ConfigurationException;
-import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.ScmUtils;
@@ -149,10 +147,7 @@ public static SCMHANodeDetails loadDefaultConfig(
}
/** Validates SCM HA Config.
- For Non Initialized SCM the value is taken directly based on the config
- {@link org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY}
- which defaults to
- {@link org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HA_ENABLE_DEFAULT}
+ For Non Initialized SCM the value is true.
For Previously Initialized SCM the values are taken from the version file
<br>
Ratis SCM -> Non Ratis SCM is not supported.
@@ -164,30 +159,8 @@ private static void validateSCMHAConfig(SCMStorageConfig
scmStorageConfig,
boolean scmHAEnableDefault = state == Storage.StorageState.INITIALIZED
? scmStorageConfig.isSCMHAEnabled()
: SCMHAUtils.isSCMHAEnabled(conf);
- boolean scmHAEnabled = SCMHAUtils.isSCMHAEnabled(conf);
-
- if (Storage.StorageState.INITIALIZED.equals(state) &&
- scmHAEnabled != scmHAEnableDefault) {
- String errorMessage = String.format("Current State of SCM: %s",
- scmHAEnableDefault ? "SCM is running with Ratis. "
- : "SCM is running without Ratis. ")
- + "Ratis SCM -> Non Ratis SCM is not supported.";
- if (!scmHAEnabled) {
- throw new ConfigurationException(String.format("Invalid Config %s " +
- "Provided ConfigValue: false, Expected Config Value: true. %s",
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, errorMessage));
- } else {
- LOG.warn("Default/Configured value of config {} conflicts with " +
- "the expected value. " +
- "Default/Configured: {}. " +
- "Expected: {}. " +
- "Falling back to the expected value. {}",
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- scmHAEnabled, scmHAEnableDefault, errorMessage);
- }
- }
- DefaultConfigManager.setConfigValue(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- scmHAEnableDefault);
+ // If we have an initialized cluster, use the value from VERSION file.
+ SCMHAUtils.setRatisEnabled(scmHAEnableDefault);
}
public static SCMHANodeDetails loadSCMHAConfig(OzoneConfiguration conf,
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 52148c3d68..1a986f2f67 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -35,7 +35,6 @@
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -1330,8 +1329,7 @@ public static boolean scmInit(OzoneConfiguration conf,
// Initialize security if security is enabled later.
initializeSecurityIfNeeded(conf, scmStorageConfig, selfHostName, true);
- if (conf.getBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_DEFAULT) && !isSCMHAEnabled) {
+ if (SCMHAUtils.isSCMHAEnabled(conf) && !isSCMHAEnabled) {
SCMRatisServerImpl.initialize(scmStorageConfig.getClusterID(),
scmStorageConfig.getScmId(), haDetails.getLocalNodeDetails(),
conf);
@@ -1346,8 +1344,7 @@ public static boolean scmInit(OzoneConfiguration conf,
*/
try {
- DefaultConfigManager.forceUpdateConfigValue(
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, true);
+ SCMHAUtils.setRatisEnabled(true);
StorageContainerManager scm = createSCM(conf);
scm.start();
scm.getScmHAManager().getRatisServer().triggerSnapshot();
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ScmHAUnfinalizedStateValidationAction.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ScmHAUnfinalizedStateValidationAction.java
index f6d6687537..7e086ad565 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ScmHAUnfinalizedStateValidationAction.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/ScmHAUnfinalizedStateValidationAction.java
@@ -23,7 +23,6 @@
import static org.apache.hadoop.ozone.upgrade.UpgradeActionHdds.Component.SCM;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.ha.SCMHAUtils;
import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
import org.apache.hadoop.hdds.upgrade.HDDSUpgradeAction;
@@ -62,9 +61,8 @@ public static void checkScmHA(OzoneConfiguration conf,
if (!versionManager.isAllowed(SCM_HA) &&
SCMHAUtils.isSCMHAEnabled(conf) &&
!storageConf.isSCMHAEnabled()) {
- throw new UpgradeException(String.format("Configuration %s cannot be " +
- "used until SCM upgrade has been finalized",
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY),
+ throw new UpgradeException("Ratis cannot be " +
+ "used until SCM upgrade has been finalized",
UpgradeException.ResultCodes.PREFINALIZE_ACTION_VALIDATION_FAILED);
}
}
diff --git a/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
b/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
index ff7883fc55..1e4f14b257 100644
--- a/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
+++ b/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
@@ -39,10 +39,6 @@
<name>ozone.metadata.dirs</name>
<value>/tmp/metadata</value>
</property>
- <property>
- <name>ozone.scm.ratis.enable</name>
- <value>true</value>
- </property>
<property>
<name>ozone.scm.service.ids</name>
<value>scm-group</value>
diff --git a/hadoop-ozone/dev-support/intellij/ozone-site.xml
b/hadoop-ozone/dev-support/intellij/ozone-site.xml
index e530b9fe0a..c06449cee7 100644
--- a/hadoop-ozone/dev-support/intellij/ozone-site.xml
+++ b/hadoop-ozone/dev-support/intellij/ozone-site.xml
@@ -75,10 +75,6 @@
<name>datanode.replication.port</name>
<value>0</value>
</property>
- <property>
- <name>ozone.scm.ratis.enable</name>
- <value>false</value>
- </property>
<property>
<name>hdds.container.report.interval</name>
<value>60m</value>
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
index 3d0cfce1ea..39d97178e3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
@@ -32,7 +32,6 @@ OZONE-SITE.XML_ozone.scm.nodes.scmservice=scm1,scm2,scm3
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1=scm1
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2=scm2
OZONE-SITE.XML_ozone.scm.address.scmservice.scm3=scm3
-OZONE-SITE.XML_ozone.scm.ratis.enable=true
OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data/metadata
OZONE-SITE.XML_ozone.scm.container.size=100MB
OZONE-SITE.XML_ozone.scm.block.size=20MB
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
index 92a71eea3c..7317b2c1aa 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
@@ -32,7 +32,6 @@ OZONE-SITE.XML_ozone.scm.nodes.scmservice=scm1,scm2,scm3
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1=scm1
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2=scm2
OZONE-SITE.XML_ozone.scm.address.scmservice.scm3=scm3
-OZONE-SITE.XML_ozone.scm.ratis.enable=true
OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data/metadata
OZONE-SITE.XML_ozone.scm.container.size=1GB
OZONE-SITE.XML_ozone.scm.datanode.ratis.volume.free-space.min=10MB
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
index a4f030d45f..01ddca174e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
@@ -37,7 +37,6 @@ OZONE-SITE.XML_ozone.scm.nodes.scmservice=scm1,scm2,scm3
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1=scm1.org
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2=scm2.org
OZONE-SITE.XML_ozone.scm.address.scmservice.scm3=scm3.org
-OZONE-SITE.XML_ozone.scm.ratis.enable=true
OZONE-SITE.XML_ozone.scm.close.container.wait.duration=5s
OZONE-SITE.XML_ozone.om.volume.listall.allowed=false
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config
index bb68e9bf60..e19062a725 100644
--- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config
@@ -29,7 +29,6 @@ OZONE-SITE.XML_ozone.scm.nodes.scmservice=scm1,scm2,scm3
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1=scm1.org
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2=scm2.org
OZONE-SITE.XML_ozone.scm.address.scmservice.scm3=scm3.org
-OZONE-SITE.XML_ozone.scm.ratis.enable=true
OZONE-SITE.XML_ozone.scm.primordial.node.id=scm1
OZONE-SITE.XML_ozone.scm.pipeline.creation.interval=30s
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/om-ha.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/om-ha.yaml
index 3832bb207e..4a8d6b17b8 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/om-ha.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/om-ha.yaml
@@ -49,7 +49,6 @@ description: Enable HA for SCM components
OZONE-SITE.XML_ozone.scm.address.scmservice.scm0:
scm-0.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1:
scm-1.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2:
scm-2.scm.default.svc.cluster.local
- OZONE-SITE.XML_ozone.scm.ratis.enable: "true"
OZONE-SITE.XML_ozone.scm.primordial.node.id: scm0
- type: add
trigger:
diff --git
a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/scm-ha.yaml
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/scm-ha.yaml
index b7aca3c55d..55a4c52780 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/scm-ha.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/definitions/scm-ha.yaml
@@ -49,7 +49,6 @@ description: Enable HA for SCM component
OZONE-SITE.XML_ozone.scm.address.scmservice.scm0:
scm-0.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1:
scm-1.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2:
scm-2.scm.default.svc.cluster.local
- OZONE-SITE.XML_ozone.scm.ratis.enable: "true"
OZONE-SITE.XML_ozone.scm.primordial.node.id: scm0
- type: add
trigger:
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
index a9315eb210..dbfdde0f0f 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
@@ -42,5 +42,4 @@ data:
OZONE-SITE.XML_ozone.scm.address.scmservice.scm0:
scm-0.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm1:
scm-1.scm.default.svc.cluster.local
OZONE-SITE.XML_ozone.scm.address.scmservice.scm2:
scm-2.scm.default.svc.cluster.local
- OZONE-SITE.XML_ozone.scm.ratis.enable: "true"
OZONE-SITE.XML_ozone.scm.primordial.node.id: scm0
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 b3d9f78088..64db4c1900 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
@@ -691,7 +691,6 @@ protected void initializeConfiguration() throws IOException
{
Path metaDir = Paths.get(path, "ozone-meta");
Files.createDirectories(metaDir);
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDir.toString());
- // conf.setBoolean(ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY, true);
conf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
DEFAULT_RATIS_RPC_TIMEOUT_SEC, TimeUnit.SECONDS);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index 809c19c972..6d415c0c15 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -89,7 +89,6 @@ private void addPropertiesNotInXml() {
OMConfigKeys.OZONE_OM_DECOMMISSIONED_NODES_KEY,
ScmConfigKeys.OZONE_SCM_NODES_KEY,
ScmConfigKeys.OZONE_SCM_ADDRESS_KEY,
- ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY,
ScmConfigKeys.OZONE_CHUNK_READ_NETTY_CHUNKED_NIO_FILE_KEY,
OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY,
OMConfigKeys.OZONE_FS_TRASH_CHECKPOINT_INTERVAL_KEY,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
