Skip to content

HDDS-12032. Remove DefaultConfigManager from SCM. #7757

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
nandakumar131 merged 1 commit into from
Jan 28, 2025
Merged

HDDS-12032. Remove DefaultConfigManager from SCM. #7757

Show file tree
Hide file tree
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
60 changes: 0 additions & 60 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DefaultConfigManager.java
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm.ha;

import org.apache.hadoop.hdds.HddsConfigKeys;
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.ScmRatisServerConfig;
Expand All @@ -33,6 +32,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -74,7 +75,6 @@ class TestSCMConfiguration {
void setup() {
conf = new OzoneConfiguration();
conf.set(OZONE_METADATA_DIRS, tempDir.getAbsolutePath());
DefaultConfigManager.clearDefaultConfigs();
}

@Test
Expand Down Expand Up @@ -293,19 +293,21 @@ public void testSamePortConfig() throws Exception {

}

@Test
public void testDefaultConfigWithInitializedSCM()
@ParameterizedTest
@ValueSource(booleans = {true, false})
public void testDefaultConfigWithInitializedSCM(boolean isRatisEnabled)
throws IOException {
// The default config for RatisEnabled is true.
assertTrue(SCMHAUtils.isSCMHAEnabled(conf));

// If the cluster is already initalized, use the value from StorageConfig.
SCMStorageConfig scmStorageConfig = mock(SCMStorageConfig.class);
when(scmStorageConfig.getState())
.thenReturn(Storage.StorageState.INITIALIZED);
when(scmStorageConfig.isSCMHAEnabled()).thenReturn(false);
DefaultConfigManager.clearDefaultConfigs();
when(scmStorageConfig.isSCMHAEnabled()).thenReturn(isRatisEnabled);
SCMHANodeDetails.loadSCMHAConfig(conf, scmStorageConfig);

assertEquals(SCMHAUtils.isSCMHAEnabled(conf),
scmStorageConfig.isSCMHAEnabled());
when(scmStorageConfig.isSCMHAEnabled()).thenReturn(false);
DefaultConfigManager.clearDefaultConfigs();
assertTrue(SCMHAUtils.isSCMHAEnabled(conf));
}
}
3 changes: 0 additions & 3 deletions ...st/java/org/apache/hadoop/hdds/scm/upgrade/TestSCMHAUnfinalizedStateValidationAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hdds.scm.upgrade;

import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.HddsTestUtils;
import org.apache.hadoop.hdds.scm.ScmConfig;
Expand Down Expand Up @@ -67,7 +66,6 @@ public void testUpgrade(@TempDir Path dataPath) throws Exception {
conf.set(ScmConfigKeys.OZONE_SCM_DB_DIRS, dataPath.toString());
conf.set(OzoneConfigKeys.OZONE_METADATA_DIRS, dataPath.toString());
// This init should always succeed, since SCM is not pre-finalized yet.
DefaultConfigManager.clearDefaultConfigs();
boolean initResult1 = StorageContainerManager.scmInit(conf, CLUSTER_ID);
assertTrue(initResult1);

Expand All @@ -77,7 +75,6 @@ public void testUpgrade(@TempDir Path dataPath) throws Exception {
scm.getFinalizationManager().getUpgradeFinalizer().getStatus());


DefaultConfigManager.clearDefaultConfigs();
boolean initResult2 = StorageContainerManager.scmInit(conf, CLUSTER_ID);
assertTrue(initResult2);
scm.start();
Expand Down
2 changes: 0 additions & 2 deletions ...zone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm;

import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
Expand Down Expand Up @@ -137,7 +136,6 @@ public void stop() {
if (cluster != null) {
cluster.stop();
}
DefaultConfigManager.clearDefaultConfigs();
}

private void createCredentialsInKDC() throws Exception {
Expand Down
2 changes: 0 additions & 2 deletions ...op-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hdds.scm;

import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.SecretKeyProtocol;
import org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig;
Expand Down Expand Up @@ -119,7 +118,6 @@ public void stop() {
if (cluster != null) {
cluster.stop();
}
DefaultConfigManager.clearDefaultConfigs();
}

private void createCredentialsInKDC() throws Exception {
Expand Down
2 changes: 0 additions & 2 deletions ...egration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.hadoop.hdds.scm;

import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.container.ContainerID;
Expand Down Expand Up @@ -118,7 +117,6 @@ public void shutdown() {
if (cluster != null) {
cluster.shutdown();
}
DefaultConfigManager.clearDefaultConfigs();
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.ScmConfig;
Expand Down Expand Up @@ -157,7 +156,6 @@ public static void stop() {
if (cluster != null) {
cluster.stop();
}
DefaultConfigManager.clearDefaultConfigs();
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.google.common.collect.Maps;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.ozone.admin.OzoneAdmin;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfig;
import org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig;
Expand Down Expand Up @@ -127,7 +126,6 @@ public static void stop() {
if (cluster != null) {
cluster.stop();
}
DefaultConfigManager.clearDefaultConfigs();
}

private SecretKeyManager getScmSecretKeyManager() {
Expand Down
2 changes: 0 additions & 2 deletions ...-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMultipartObjectGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.ozone;

import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.ozone.client.OzoneClient;
Expand Down Expand Up @@ -121,7 +120,6 @@ public static void stop() {
if (cluster != null) {
cluster.stop();
}
DefaultConfigManager.clearDefaultConfigs();
}

private String initiateMultipartUpload() throws IOException, OS3Exception {
Expand Down
2 changes: 0 additions & 2 deletions ...-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

import org.apache.commons.validator.routines.DomainValidator;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.DefaultConfigManager;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.SCMSecurityProtocolProtos;
Expand Down Expand Up @@ -280,7 +279,6 @@ void stop() throws Exception {
} catch (Exception e) {
LOG.error("Failed to stop TestSecureOzoneCluster", e);
}
DefaultConfigManager.clearDefaultConfigs();
}

private void createCredentialsInKDC() throws Exception {
Expand Down
Loading