From 7956af3b6f04596cf64dd2bb17f7c8f188243801 Mon Sep 17 00:00:00 2001 From: sarvekshayr Date: Tue, 18 Feb 2025 13:39:36 +0530 Subject: [PATCH 1/6] HDDS-12172. Rename Java constants of DFSConfigKeysLegacy keys --- .../hadoop/hdds/DFSConfigKeysLegacy.java | 28 +++++++++---------- .../org/apache/hadoop/hdds/HddsUtils.java | 14 +++++----- .../hadoop/hdds/conf/OzoneConfiguration.java | 24 ++++++++-------- .../apache/hadoop/hdds/ratis/RatisHelper.java | 4 +-- .../hadoop/ozone/HddsDatanodeService.java | 8 +++--- .../common/helpers/ContainerMetrics.java | 2 +- .../protocolPB/ReconDatanodeProtocolPB.java | 2 +- .../StorageContainerDatanodeProtocolPB.java | 2 +- .../hadoop/ozone/TestHddsDatanodeService.java | 2 +- .../ozone/TestHddsSecureDatanodeInit.java | 2 +- .../common/volume/TestVolumeSet.java | 2 +- .../volume/TestVolumeSetDiskChecks.java | 6 ++-- .../protocol/SecretKeyProtocolDatanode.java | 4 +-- .../ReconfigureProtocolDatanodePB.java | 2 +- .../SecretKeyProtocolDatanodePB.java | 4 +-- .../hdds/server/http/BaseHttpServer.java | 8 +++--- .../hadoop/hdds/utils/HddsServerUtil.java | 8 +++--- .../scm/node/NodeDecommissionManager.java | 4 +-- .../hadoop/hdds/scm/node/SCMNodeManager.java | 4 +-- .../hdds/scm/node/TestSCMNodeManager.java | 4 +-- .../server/TestSCMBlockProtocolServer.java | 4 +-- .../server/metrics/HttpFSServerMetrics.java | 5 ++-- .../hdds/scm/TestSecretKeySnapshot.java | 8 +++--- .../hadoop/hdds/scm/TestSecretKeysApi.java | 8 +++--- .../apache/hadoop/ozone/TestBlockTokens.java | 8 +++--- .../hadoop/ozone/TestBlockTokensCLI.java | 8 +++--- .../hadoop/ozone/TestOMSortDatanodes.java | 4 +-- .../hadoop/ozone/UniformDatanodesFactory.java | 4 +-- .../metrics/TestContainerMetrics.java | 2 +- .../hadoop/ozone/om/KeyManagerImpl.java | 4 +-- 30 files changed, 94 insertions(+), 95 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java index b712c180728f..edf847bbd986 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java @@ -29,43 +29,43 @@ public final class DFSConfigKeysLegacy { private DFSConfigKeysLegacy() { } - public static final String DFS_DATANODE_DNS_INTERFACE_KEY = + public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = "hdds.datanode.dns.interface"; - public static final String DFS_DATANODE_DNS_NAMESERVER_KEY = + public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = "hdds.datanode.dns.nameserver"; - public static final String DFS_DATANODE_HOST_NAME_KEY = + public static final String HDDS_DATANODE_HOST_NAME_KEY = "hdds.datanode.hostname"; - public static final String DFS_DATANODE_DATA_DIR_KEY = + public static final String HDDS_DATANODE_DATA_DIR_KEY = "hdds.datanode.data.dir"; - public static final String DFS_DATANODE_USE_DN_HOSTNAME = + public static final String HDDS_DATANODE_USE_DN_HOSTNAME = "hdds.datanode.use.datanode.hostname"; - public static final boolean DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; + public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; - public static final String DFS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; + public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; - public static final boolean DFS_XFRAME_OPTION_ENABLED_DEFAULT = true; + public static final boolean HDDS_XFRAME_OPTION_ENABLED_DEFAULT = true; - public static final String DFS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; + public static final String HDDS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; - public static final String DFS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; + public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; - public static final String DFS_METRICS_SESSION_ID_KEY = + public static final String HDDS_METRICS_SESSION_ID_KEY = "hdds.metrics.session-id"; public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = "net.topology.node.switch.mapping.impl"; - public static final String DFS_DATANODE_KERBEROS_PRINCIPAL_KEY = + public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = "hdds.datanode.kerberos.principal"; - public static final String DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = + public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = "hdds.datanode.kerberos.keytab.file"; - public static final String DFS_METRICS_PERCENTILES_INTERVALS_KEY = + public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = "hdds.metrics.percentiles.intervals"; } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java index ed86732be3c8..53ff4bc7bcef 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java @@ -17,9 +17,9 @@ package org.apache.hadoop.hdds; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_DNS_INTERFACE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_DNS_NAMESERVER_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_HOST_NAME_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DNS_INTERFACE_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DNS_NAMESERVER_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_HOST_NAME_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_BIND_HOST_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_BIND_HOST_KEY; @@ -361,7 +361,7 @@ public static InetSocketAddress getReconAddresses( */ public static String getHostName(ConfigurationSource conf) throws UnknownHostException { - String name = conf.get(DFS_DATANODE_HOST_NAME_KEY); + String name = conf.get(HDDS_DATANODE_HOST_NAME_KEY); if (name == null) { String dnsInterface = conf.get( CommonConfigurationKeysPublic.HADOOP_SECURITY_DNS_INTERFACE_KEY); @@ -371,9 +371,9 @@ public static String getHostName(ConfigurationSource conf) if (dnsInterface == null) { // Try the legacy configuration keys. - dnsInterface = conf.get(DFS_DATANODE_DNS_INTERFACE_KEY); - dnsInterface = conf.get(DFS_DATANODE_DNS_INTERFACE_KEY); - nameServer = conf.get(DFS_DATANODE_DNS_NAMESERVER_KEY); + dnsInterface = conf.get(HDDS_DATANODE_DNS_INTERFACE_KEY); + dnsInterface = conf.get(HDDS_DATANODE_DNS_INTERFACE_KEY); + nameServer = conf.get(HDDS_DATANODE_DNS_NAMESERVER_KEY); } else { // If HADOOP_SECURITY_DNS_* is set then also attempt hosts file // resolution if DNS fails. We will not use hosts file resolution diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java index be689a7196b1..72fcfaf9ba35 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java @@ -315,7 +315,7 @@ private static void addDeprecatedKeys() { HDDS_DATANODE_RATIS_PREFIX_KEY + "." + RaftServerConfigKeys.PREFIX + "." + "rpc.slowness.timeout"), new DeprecationDelta("dfs.datanode.keytab.file", - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("ozone.scm.chunk.layout", ScmConfigKeys.OZONE_SCM_CONTAINER_LAYOUT_KEY), new DeprecationDelta("hdds.datanode.replication.work.dir", @@ -381,21 +381,21 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.ratis.snapshot.threshold", ScmConfigKeys.HDDS_RATIS_SNAPSHOT_THRESHOLD_KEY), new DeprecationDelta("dfs.datanode.dns.interface", - DFSConfigKeysLegacy.DFS_DATANODE_DNS_INTERFACE_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_DNS_INTERFACE_KEY), new DeprecationDelta("dfs.datanode.dns.nameserver", - DFSConfigKeysLegacy.DFS_DATANODE_DNS_NAMESERVER_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_DNS_NAMESERVER_KEY), new DeprecationDelta("dfs.datanode.hostname", - DFSConfigKeysLegacy.DFS_DATANODE_HOST_NAME_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_HOST_NAME_KEY), new DeprecationDelta("dfs.datanode.data.dir", - DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY), new DeprecationDelta("dfs.datanode.use.datanode.hostname", - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME), + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME), new DeprecationDelta("dfs.xframe.enabled", - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_ENABLED), + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED), new DeprecationDelta("dfs.xframe.value", - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_VALUE), + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE), new DeprecationDelta("dfs.metrics.session-id", - DFSConfigKeysLegacy.DFS_METRICS_SESSION_ID_KEY), + DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY), new DeprecationDelta("dfs.client.https.keystore.resource", OzoneConfigKeys.OZONE_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY), new DeprecationDelta("dfs.https.server.keystore.resource", @@ -403,11 +403,11 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.http.policy", OzoneConfigKeys.OZONE_HTTP_POLICY_KEY), new DeprecationDelta("dfs.datanode.kerberos.principal", - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), new DeprecationDelta("dfs.datanode.kerberos.keytab.file", - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("dfs.metrics.percentiles.intervals", - DFSConfigKeysLegacy.DFS_METRICS_PERCENTILES_INTERVALS_KEY), + DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY), }); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java index 2a061a628cd1..e74676d1dfc7 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java @@ -450,8 +450,8 @@ public static Long getMinReplicatedIndex( private static boolean datanodeUseHostName() { return CONF.getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); } private static Class getClass(String name, diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 518d417f07c9..922a5b93a63e 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -249,16 +249,16 @@ public String getNamespace() { UserGroupInformation.AuthenticationMethod.KERBEROS)) { LOG.info("Ozone security is enabled. Attempting login for Hdds " + "Datanode user. Principal: {},keytab: {}", conf.get( - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY), + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), conf.get( - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); UserGroupInformation.setConfiguration(conf); SecurityUtil .login(conf, - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, - DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, hostname); } else { throw new AuthenticationException(SecurityUtil. diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java index 8c620f45e74b..abafa3567931 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java @@ -94,7 +94,7 @@ public static ContainerMetrics create(ConfigurationSource conf) { MetricsSystem ms = DefaultMetricsSystem.instance(); // Percentile measurement is off by default, by watching no intervals int[] intervals = - conf.getInts(DFSConfigKeysLegacy.DFS_METRICS_PERCENTILES_INTERVALS_KEY); + conf.getInts(DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY); return ms.register(STORAGE_CONTAINER_METRICS, "Storage Container Node Metrics", new ContainerMetrics(intervals)); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java index 859e595d515d..c583a034ab4c 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java @@ -32,7 +32,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = OZONE_RECON_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconDatanodeProtocolPB extends StorageContainerDatanodeProtocolPB { } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java index a6263ea7060e..53250047aed6 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java @@ -33,7 +33,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface StorageContainerDatanodeProtocolPB extends StorageContainerDatanodeProtocolService.BlockingInterface { } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java index b9141a68b5aa..c77dac4c2157 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java @@ -99,7 +99,7 @@ public void setUp() throws IOException { conf.setBoolean(HDDS_CONTAINER_TOKEN_ENABLED, true); String volumeDir = testDir + OZONE_URI_DELIMITER + "disk1"; - conf.set(DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); } @ParameterizedTest diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java index addab7902f0a..3a2a756812ce 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java @@ -98,7 +98,7 @@ public static void setUp() throws Exception { conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath()); //conf.set(ScmConfigKeys.OZONE_SCM_NAMES, "localhost"); String volumeDir = testDir + "/disk1"; - conf.set(DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true); conf.setClass(OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY, diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java index ef2cc4489d0d..438e672d2b5e 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java @@ -77,7 +77,7 @@ public void setup() throws Exception { String dataDirKey = volume1 + "," + volume2; volumes.add(volume1); volumes.add(volume2); - conf.set(DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY, dataDirKey); + conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, dataDirKey); conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dataDirKey); initializeVolumeSet(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java index 6d073fdd55c3..5419611c7b95 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java @@ -91,7 +91,7 @@ public class TestVolumeSetDiskChecks { @AfterEach public void cleanup() { final Collection dirs = conf.getTrimmedStringCollection( - DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY); + DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY); for (String d: dirs) { FileUtils.deleteQuietly(new File(d)); @@ -116,7 +116,7 @@ public void testOzoneDirsAreCreated() throws IOException { // Verify that the Ozone dirs were created during initialization. Collection dirs = conf.getTrimmedStringCollection( - DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY); + DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY); for (String d : dirs) { assertTrue(new File(d).isDirectory()); } @@ -223,7 +223,7 @@ private OzoneConfiguration getConfWithDataNodeDirs(int numDirs) { for (int i = 0; i < numDirs; ++i) { dirs.add(new File(dir, randomAlphanumeric(10)).toString()); } - ozoneConf.set(DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY, + ozoneConf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, String.join(",", dirs)); final List metaDirs = new ArrayList<>(); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java index 8857da07f2ed..c3fcc11a537b 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java @@ -17,7 +17,7 @@ package org.apache.hadoop.hdds.protocol; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.annotation.InterfaceAudience; @@ -28,7 +28,7 @@ */ @KerberosInfo( serverPrincipal = HDDS_SCM_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFS_DATANODE_KERBEROS_PRINCIPAL_KEY + clientPrincipal = HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY ) @InterfaceAudience.Private public interface SecretKeyProtocolDatanode extends SecretKeyProtocol { diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java index a7f3992da147..76d7778ecc07 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java @@ -28,6 +28,6 @@ @ProtocolInfo( protocolName = "org.apache.hadoop.hdds.protocol.ReconfigureProtocol", protocolVersion = 1) -@KerberosInfo(serverPrincipal = DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY) +@KerberosInfo(serverPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconfigureProtocolDatanodePB extends ReconfigureProtocolPB { } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java index d391127eb116..8254acc5cfb4 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java @@ -17,7 +17,7 @@ package org.apache.hadoop.hdds.protocolPB; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.protocol.proto.SCMSecretKeyProtocolProtos.SCMSecretKeyProtocolService; @@ -33,7 +33,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = HDDS_SCM_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFS_DATANODE_KERBEROS_PRINCIPAL_KEY + clientPrincipal = HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY ) public interface SecretKeyProtocolDatanodePB extends SCMSecretKeyProtocolService.BlockingInterface { diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java index 1ff3e5345240..d1958d739575 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java @@ -128,12 +128,12 @@ public BaseHttpServer(MutableConfigurationSource conf, String name) } final boolean xFrameEnabled = conf.getBoolean( - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_ENABLED, - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_ENABLED_DEFAULT); + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED, + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED_DEFAULT); final String xFrameOptionValue = conf.getTrimmed( - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_VALUE, - DFSConfigKeysLegacy.DFS_XFRAME_OPTION_VALUE_DEFAULT); + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE, + DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE_DEFAULT); builder.configureXFrame(xFrameEnabled).setXFrameOption(xFrameOptionValue); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java index c3879a5760f9..ca609970913d 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java @@ -17,7 +17,7 @@ package org.apache.hadoop.hdds.utils; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_RECON_HEARTBEAT_INTERVAL; @@ -409,11 +409,11 @@ public static Collection getDatanodeStorageDirs( Collection rawLocations = conf.getTrimmedStringCollection( HDDS_DATANODE_DIR_KEY); if (rawLocations.isEmpty()) { - rawLocations = conf.getTrimmedStringCollection(DFS_DATANODE_DATA_DIR_KEY); + rawLocations = conf.getTrimmedStringCollection(HDDS_DATANODE_DATA_DIR_KEY); } if (rawLocations.isEmpty()) { throw new IllegalArgumentException("No location configured in either " - + HDDS_DATANODE_DIR_KEY + " or " + DFS_DATANODE_DATA_DIR_KEY); + + HDDS_DATANODE_DIR_KEY + " or " + HDDS_DATANODE_DATA_DIR_KEY); } return rawLocations; } @@ -580,7 +580,7 @@ public static MetricsSystem initializeMetrics( MetricsSystem metricsSystem = DefaultMetricsSystem.initialize(serverName); try { JvmMetrics.create(serverName, - configuration.get(DFSConfigKeysLegacy.DFS_METRICS_SESSION_ID_KEY), + configuration.get(DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY), DefaultMetricsSystem.instance()); CpuMetrics.create(); } catch (MetricsException e) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java index 3ba7ff2fefac..facc913be325 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java @@ -273,8 +273,8 @@ public NodeDecommissionManager(OzoneConfiguration config, NodeManager nm, Contai ); useHostnames = config.getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); long monitorInterval = config.getTimeDuration( ScmConfigKeys.OZONE_SCM_DATANODE_ADMIN_MONITOR_INTERVAL, diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java index cbeafa4dbd39..5e897ed140dd 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java @@ -182,8 +182,8 @@ public SCMNodeManager( this.clusterMap = networkTopology; this.nodeResolver = nodeResolver; this.useHostname = conf.getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); this.numPipelinesPerMetadataVolume = conf.getInt(ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME, ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME_DEFAULT); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java index 0212999689f8..480ffb5c8f30 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java @@ -1828,7 +1828,7 @@ void testScmRegisterNodeWithNetworkTopology(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create table mapping file @@ -1942,7 +1942,7 @@ void testGetNodesByAddress(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create a set of hosts - note two hosts on "host1" diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java index d94c7e5a119f..7992e3180aff 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java @@ -346,8 +346,8 @@ private List getNetworkNames() { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java index ea3dd0c5f3e0..f92f03a70c74 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java @@ -17,6 +17,7 @@ package org.apache.ozone.fs.http.server.metrics; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY; import static org.apache.hadoop.metrics2.impl.MsInfo.SessionId; import java.util.concurrent.ThreadLocalRandom; @@ -46,8 +47,6 @@ @Metrics(about = "HttpFSServer metrics", context = "httpfs") public class HttpFSServerMetrics { - private static final String DFS_METRICS_SESSION_ID_KEY - = "hdds.metrics.session-id"; private @Metric MutableCounterLong bytesWritten; private @Metric MutableCounterLong bytesRead; @@ -78,7 +77,7 @@ public HttpFSServerMetrics(String name, String sessionId, public static HttpFSServerMetrics create(Configuration conf, String serverName) { - String sessionId = conf.get(DFS_METRICS_SESSION_ID_KEY); + String sessionId = conf.get(HDDS_METRICS_SESSION_ID_KEY); MetricsSystem ms = DefaultMetricsSystem.instance(); JvmMetrics jm = JvmMetrics.create("HttpFSServer", sessionId, ms); String name = "ServerActivity-" + (serverName.isEmpty() 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 6bea5c213a11..15348f022e35 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 @@ -49,8 +49,8 @@ import java.util.concurrent.TimeoutException; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; @@ -173,7 +173,7 @@ private void setSecureConfig() throws IOException { conf.set(HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_SCM/" + hostAndRealm); conf.set(OZONE_OM_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); conf.set(OZONE_OM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_OM/" + hostAndRealm); - conf.set(DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); + conf.set(HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); ozoneKeytab = new File(workDir, "scm.keytab"); spnegoKeytab = new File(workDir, "http.keytab"); @@ -186,7 +186,7 @@ private void setSecureConfig() throws IOException { ozoneKeytab.getAbsolutePath()); conf.set(OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE, spnegoKeytab.getAbsolutePath()); - conf.set(DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + conf.set(HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, ozoneKeytab.getAbsolutePath()); conf.setBoolean(HDDS_BLOCK_TOKEN_ENABLED, true); 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 91c81df0653c..2f5f534c3f81 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 @@ -54,8 +54,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; @@ -156,7 +156,7 @@ private void setSecureConfig() throws IOException { conf.set(HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_SCM/" + hostAndRealm); conf.set(OZONE_OM_KERBEROS_PRINCIPAL_KEY, ozonePrincipal); conf.set(OZONE_OM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_OM/" + hostAndRealm); - conf.set(DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, ozonePrincipal); + conf.set(HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, ozonePrincipal); ozoneKeytab = new File(workDir, "scm.keytab"); spnegoKeytab = new File(workDir, "http.keytab"); @@ -171,7 +171,7 @@ private void setSecureConfig() throws IOException { ozoneKeytab.getAbsolutePath()); conf.set(OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE, spnegoKeytab.getAbsolutePath()); - conf.set(DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + conf.set(HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, ozoneKeytab.getAbsolutePath()); conf.setBoolean(HADOOP_SECURITY_AUTHORIZATION, true); 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 210fdf937576..a8fe45b11bbb 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 @@ -67,8 +67,8 @@ import static java.util.Objects.requireNonNull; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; @@ -355,7 +355,7 @@ private static void setSecureConfig() throws IOException { conf.set(HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_SCM/" + hostAndRealm); conf.set(OZONE_OM_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); conf.set(OZONE_OM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_OM/" + hostAndRealm); - conf.set(DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); + conf.set(HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); ozoneKeytab = new File(workDir, "scm.keytab"); spnegoKeytab = new File(workDir, "http.keytab"); @@ -370,7 +370,7 @@ private static void setSecureConfig() throws IOException { ozoneKeytab.getAbsolutePath()); conf.set(OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE, spnegoKeytab.getAbsolutePath()); - conf.set(DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + conf.set(HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, ozoneKeytab.getAbsolutePath()); } 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 fd34eada285a..47d90d6d9ace 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 @@ -52,8 +52,8 @@ import static java.time.Duration.between; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_KEYTAB_FILE_KEY; @@ -173,7 +173,7 @@ private static void setSecureConfig() throws IOException { conf.set(HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_SCM/" + hostAndRealm); conf.set(OZONE_OM_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); conf.set(OZONE_OM_HTTP_KERBEROS_PRINCIPAL_KEY, "HTTP_OM/" + hostAndRealm); - conf.set(DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); + conf.set(HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, "scm/" + hostAndRealm); ozoneKeytab = new File(workDir, "scm.keytab"); spnegoKeytab = new File(workDir, "http.keytab"); @@ -186,7 +186,7 @@ private static void setSecureConfig() throws IOException { ozoneKeytab.getAbsolutePath()); conf.set(OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE, spnegoKeytab.getAbsolutePath()); - conf.set(DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + conf.set(HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, ozoneKeytab.getAbsolutePath()); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java index 6b7dde3934d7..28b78e8cd876 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java @@ -185,8 +185,8 @@ private static void assertRackOrder(String rack, List list) { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java index ecf281a1a861..fddaf79002ba 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.DFS_DATANODE_DATA_DIR_KEY; +import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_HTTP_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS; @@ -97,7 +97,7 @@ public OzoneConfiguration apply(OzoneConfiguration conf) throws IOException { } String reservedSpaceString = String.join(",", reservedSpaceList); String listOfDirs = String.join(",", dataDirs); - dnConf.set(DFS_DATANODE_DATA_DIR_KEY, listOfDirs); + dnConf.set(HDDS_DATANODE_DATA_DIR_KEY, listOfDirs); dnConf.set(HDDS_DATANODE_DIR_KEY, listOfDirs); dnConf.set(HDDS_DATANODE_DIR_DU_RESERVED, reservedSpaceString); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java index bc2dcda8e54a..a05006b4691f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java @@ -91,7 +91,7 @@ public class TestContainerMetrics { @BeforeAll public static void setup() { DefaultMetricsSystem.setMiniClusterMode(true); - CONF.setInt(DFSConfigKeysLegacy.DFS_METRICS_PERCENTILES_INTERVALS_KEY, + CONF.setInt(DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY, DFS_METRICS_PERCENTILES_INTERVALS); CONF.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED, false); CONF.set(OzoneConfigKeys.OZONE_METADATA_DIRS, testDir.toString()); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java index 54b4608e64f2..6f90f8244083 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java @@ -1967,8 +1967,8 @@ private Node getClientNode(String clientMachine, List nodes) { List matchingNodes = new ArrayList<>(); boolean useHostname = ozoneManager.getConfiguration().getBoolean( - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); for (DatanodeDetails node : nodes) { if ((useHostname ? node.getHostName() : node.getIpAddress()).equals( clientMachine)) { From 5197e52c9cf02ab4e017b6c04f60be898f19e093 Mon Sep 17 00:00:00 2001 From: sarvekshayr Date: Tue, 18 Feb 2025 15:11:49 +0530 Subject: [PATCH 2/6] Moved constants and deleted DFSConfigKeysLegacy --- .../hadoop/hdds/DFSConfigKeysLegacy.java | 73 ------------------- .../org/apache/hadoop/hdds/HddsUtils.java | 6 +- .../hadoop/hdds/conf/OzoneConfiguration.java | 25 +++---- .../apache/hadoop/hdds/ratis/RatisHelper.java | 6 +- .../apache/hadoop/ozone/OzoneConfigKeys.java | 28 +++++++ .../hadoop/ozone/HddsDatanodeService.java | 9 +-- .../common/helpers/ContainerMetrics.java | 4 +- .../protocolPB/ReconDatanodeProtocolPB.java | 4 +- .../StorageContainerDatanodeProtocolPB.java | 4 +- .../hadoop/ozone/TestHddsDatanodeService.java | 3 +- .../ozone/TestHddsSecureDatanodeInit.java | 3 +- .../common/volume/TestVolumeSet.java | 3 +- .../volume/TestVolumeSetDiskChecks.java | 7 +- .../protocol/SecretKeyProtocolDatanode.java | 2 +- .../ReconfigureProtocolDatanodePB.java | 4 +- .../SecretKeyProtocolDatanodePB.java | 2 +- .../hdds/server/http/BaseHttpServer.java | 9 +-- .../hadoop/hdds/utils/HddsServerUtil.java | 5 +- .../scm/node/NodeDecommissionManager.java | 6 +- .../hadoop/hdds/scm/node/SCMNodeManager.java | 6 +- .../scm/server/StorageContainerManager.java | 3 +- .../hdds/scm/node/TestSCMNodeManager.java | 6 +- .../server/TestSCMBlockProtocolServer.java | 6 +- .../server/metrics/HttpFSServerMetrics.java | 2 +- .../hdds/scm/TestSecretKeySnapshot.java | 4 +- .../hadoop/hdds/scm/TestSecretKeysApi.java | 4 +- .../apache/hadoop/ozone/TestBlockTokens.java | 4 +- .../hadoop/ozone/TestBlockTokensCLI.java | 4 +- .../hadoop/ozone/TestOMSortDatanodes.java | 5 +- .../hadoop/ozone/UniformDatanodesFactory.java | 2 +- .../metrics/TestContainerMetrics.java | 3 +- .../hadoop/ozone/om/KeyManagerImpl.java | 8 +- 32 files changed, 102 insertions(+), 158 deletions(-) delete mode 100644 hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java deleted file mode 100644 index edf847bbd986..000000000000 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.hdds; - -/** - * Legacy HDFS keys used by ozone. - * - * THey are the HDFS specific config keys. It would be better to use ozone - * specific explicit configuration keys with ozone to make it more visible. - */ -@Deprecated -public final class DFSConfigKeysLegacy { - - private DFSConfigKeysLegacy() { - } - - public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = - "hdds.datanode.dns.interface"; - public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = - "hdds.datanode.dns.nameserver"; - - public static final String HDDS_DATANODE_HOST_NAME_KEY = - "hdds.datanode.hostname"; - - public static final String HDDS_DATANODE_DATA_DIR_KEY = - "hdds.datanode.data.dir"; - - public static final String HDDS_DATANODE_USE_DN_HOSTNAME = - "hdds.datanode.use.datanode.hostname"; - - public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; - - public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; - - public static final boolean HDDS_XFRAME_OPTION_ENABLED_DEFAULT = true; - - public static final String HDDS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; - - public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; - - public static final String HDDS_METRICS_SESSION_ID_KEY = - "hdds.metrics.session-id"; - - public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = - "net.topology.node.switch.mapping.impl"; - - public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = - "hdds.datanode.kerberos.principal"; - - public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = - "hdds.datanode.kerberos.keytab.file"; - - public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = - "hdds.metrics.percentiles.intervals"; - -} - - diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java index 53ff4bc7bcef..c9c7c793b2bc 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java @@ -17,9 +17,6 @@ package org.apache.hadoop.hdds; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DNS_INTERFACE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DNS_NAMESERVER_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_HOST_NAME_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_BIND_HOST_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_BIND_HOST_KEY; @@ -34,6 +31,9 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_DEFAULT; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_KEY; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY; import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java index 72fcfaf9ba35..0289a2529635 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java @@ -47,7 +47,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource; @@ -315,7 +314,7 @@ private static void addDeprecatedKeys() { HDDS_DATANODE_RATIS_PREFIX_KEY + "." + RaftServerConfigKeys.PREFIX + "." + "rpc.slowness.timeout"), new DeprecationDelta("dfs.datanode.keytab.file", - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("ozone.scm.chunk.layout", ScmConfigKeys.OZONE_SCM_CONTAINER_LAYOUT_KEY), new DeprecationDelta("hdds.datanode.replication.work.dir", @@ -381,21 +380,21 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.ratis.snapshot.threshold", ScmConfigKeys.HDDS_RATIS_SNAPSHOT_THRESHOLD_KEY), new DeprecationDelta("dfs.datanode.dns.interface", - DFSConfigKeysLegacy.HDDS_DATANODE_DNS_INTERFACE_KEY), + OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY), new DeprecationDelta("dfs.datanode.dns.nameserver", - DFSConfigKeysLegacy.HDDS_DATANODE_DNS_NAMESERVER_KEY), + OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY), new DeprecationDelta("dfs.datanode.hostname", - DFSConfigKeysLegacy.HDDS_DATANODE_HOST_NAME_KEY), + OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY), new DeprecationDelta("dfs.datanode.data.dir", - DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY), + OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY), new DeprecationDelta("dfs.datanode.use.datanode.hostname", - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME), + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME), new DeprecationDelta("dfs.xframe.enabled", - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED), + OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED), new DeprecationDelta("dfs.xframe.value", - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE), + OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE), new DeprecationDelta("dfs.metrics.session-id", - DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY), + OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY), new DeprecationDelta("dfs.client.https.keystore.resource", OzoneConfigKeys.OZONE_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY), new DeprecationDelta("dfs.https.server.keystore.resource", @@ -403,11 +402,11 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.http.policy", OzoneConfigKeys.OZONE_HTTP_POLICY_KEY), new DeprecationDelta("dfs.datanode.kerberos.principal", - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), new DeprecationDelta("dfs.datanode.kerberos.keytab.file", - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("dfs.metrics.percentiles.intervals", - DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY), + OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY), }); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java index e74676d1dfc7..f0cf0859412b 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java @@ -34,7 +34,6 @@ import java.util.function.BooleanSupplier; import java.util.stream.Collectors; import javax.net.ssl.TrustManager; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -45,6 +44,7 @@ import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.security.SecurityConfig; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.ratis.RaftConfigKeys; import org.apache.ratis.client.RaftClient; import org.apache.ratis.client.RaftClientConfigKeys; @@ -450,8 +450,8 @@ public static Long getMinReplicatedIndex( private static boolean datanodeUseHostName() { return CONF.getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); } private static Class getClass(String name, diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java index dfa5dc41c248..a37f65105619 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java @@ -595,6 +595,34 @@ public final class OzoneConfigKeys { OZONE_CLIENT_BUCKET_REPLICATION_CONFIG_REFRESH_PERIOD_DEFAULT_MS = 300 * 1000; + public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = + "hdds.datanode.dns.interface"; + public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = + "hdds.datanode.dns.nameserver"; + public static final String HDDS_DATANODE_HOST_NAME_KEY = + "hdds.datanode.hostname"; + public static final String HDDS_DATANODE_DATA_DIR_KEY = + "hdds.datanode.data.dir"; + public static final String HDDS_DATANODE_USE_DN_HOSTNAME = + "hdds.datanode.use.datanode.hostname"; + public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; + + public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; + public static final boolean HDDS_XFRAME_OPTION_ENABLED_DEFAULT = true; + public static final String HDDS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; + public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; + + public static final String HDDS_METRICS_SESSION_ID_KEY = + "hdds.metrics.session-id"; + public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = + "net.topology.node.switch.mapping.impl"; + + public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = + "hdds.datanode.kerberos.principal"; + public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = + "hdds.datanode.kerberos.keytab.file"; + public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = + "hdds.metrics.percentiles.intervals"; // Values for bucket layout configurations. public static final String OZONE_BUCKET_LAYOUT_LEGACY = diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 922a5b93a63e..3b2adc05b48e 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -44,7 +44,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.management.ObjectName; import org.apache.hadoop.conf.Configurable; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.DatanodeVersion; import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.cli.GenericCli; @@ -249,16 +248,16 @@ public String getNamespace() { UserGroupInformation.AuthenticationMethod.KERBEROS)) { LOG.info("Ozone security is enabled. Attempting login for Hdds " + "Datanode user. Principal: {},keytab: {}", conf.get( - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), conf.get( - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); UserGroupInformation.setConfiguration(conf); SecurityUtil .login(conf, - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, - DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, hostname); } else { throw new AuthenticationException(SecurityUtil. diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java index abafa3567931..06c25b6fdabb 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java @@ -19,7 +19,6 @@ import java.io.Closeable; import java.util.EnumMap; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; @@ -31,6 +30,7 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableQuantiles; import org.apache.hadoop.metrics2.lib.MutableRate; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.util.MetricUtil; /** @@ -94,7 +94,7 @@ public static ContainerMetrics create(ConfigurationSource conf) { MetricsSystem ms = DefaultMetricsSystem.instance(); // Percentile measurement is off by default, by watching no intervals int[] intervals = - conf.getInts(DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY); + conf.getInts(OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY); return ms.register(STORAGE_CONTAINER_METRICS, "Storage Container Node Metrics", new ContainerMetrics(intervals)); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java index c583a034ab4c..f532bec68621 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java @@ -19,8 +19,8 @@ import static org.apache.hadoop.hdds.recon.ReconConfig.ConfigStrings.OZONE_RECON_KERBEROS_PRINCIPAL_KEY; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -32,7 +32,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = OZONE_RECON_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconDatanodeProtocolPB extends StorageContainerDatanodeProtocolPB { } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java index 53250047aed6..e932a4151a54 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java @@ -17,10 +17,10 @@ package org.apache.hadoop.ozone.protocolPB; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageContainerDatanodeProtocolService; import org.apache.hadoop.hdds.scm.ScmConfig; import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -33,7 +33,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface StorageContainerDatanodeProtocolPB extends StorageContainerDatanodeProtocolService.BlockingInterface { } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java index c77dac4c2157..7cae7c18126e 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.ScmConfigKeys; @@ -99,7 +98,7 @@ public void setUp() throws IOException { conf.setBoolean(HDDS_CONTAINER_TOKEN_ENABLED, true); String volumeDir = testDir + OZONE_URI_DELIMITER + "disk1"; - conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); } @ParameterizedTest diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java index 3a2a756812ce..83e1f230e5d4 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java @@ -47,7 +47,6 @@ import java.util.List; import java.util.concurrent.Callable; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -98,7 +97,7 @@ public static void setUp() throws Exception { conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath()); //conf.set(ScmConfigKeys.OZONE_SCM_NAMES, "localhost"); String volumeDir = testDir + "/disk1"; - conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true); conf.setClass(OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY, diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java index 438e672d2b5e..e15ce30a879d 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.UUID; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConfigKeys; @@ -77,7 +76,7 @@ public void setup() throws Exception { String dataDirKey = volume1 + "," + volume2; volumes.add(volume1); volumes.add(volume2); - conf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, dataDirKey); + conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, dataDirKey); conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dataDirKey); initializeVolumeSet(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java index 5419611c7b95..7286c5961fbe 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java @@ -41,7 +41,6 @@ import java.util.Set; import java.util.UUID; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -91,7 +90,7 @@ public class TestVolumeSetDiskChecks { @AfterEach public void cleanup() { final Collection dirs = conf.getTrimmedStringCollection( - DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY); + OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); for (String d: dirs) { FileUtils.deleteQuietly(new File(d)); @@ -116,7 +115,7 @@ public void testOzoneDirsAreCreated() throws IOException { // Verify that the Ozone dirs were created during initialization. Collection dirs = conf.getTrimmedStringCollection( - DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY); + OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); for (String d : dirs) { assertTrue(new File(d).isDirectory()); } @@ -223,7 +222,7 @@ private OzoneConfiguration getConfWithDataNodeDirs(int numDirs) { for (int i = 0; i < numDirs; ++i) { dirs.add(new File(dir, randomAlphanumeric(10)).toString()); } - ozoneConf.set(DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY, + ozoneConf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, String.join(",", dirs)); final List metaDirs = new ArrayList<>(); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java index c3fcc11a537b..dff1edf5d849 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocol; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.security.KerberosInfo; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java index 76d7778ecc07..ec214fcd33d9 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocolPB; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.ipc.ProtocolInfo; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -28,6 +28,6 @@ @ProtocolInfo( protocolName = "org.apache.hadoop.hdds.protocol.ReconfigureProtocol", protocolVersion = 1) -@KerberosInfo(serverPrincipal = DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) +@KerberosInfo(serverPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconfigureProtocolDatanodePB extends ReconfigureProtocolPB { } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java index 8254acc5cfb4..1ad11114af5d 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocolPB; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.protocol.proto.SCMSecretKeyProtocolProtos.SCMSecretKeyProtocolService; import org.apache.hadoop.ipc.ProtocolInfo; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java index d1958d739575..dba2d8f04ffd 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java @@ -44,7 +44,6 @@ import javax.servlet.http.HttpServlet; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.HddsConfServlet; @@ -128,12 +127,12 @@ public BaseHttpServer(MutableConfigurationSource conf, String name) } final boolean xFrameEnabled = conf.getBoolean( - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED, - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_ENABLED_DEFAULT); + OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED, + OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED_DEFAULT); final String xFrameOptionValue = conf.getTrimmed( - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE, - DFSConfigKeysLegacy.HDDS_XFRAME_OPTION_VALUE_DEFAULT); + OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE, + OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE_DEFAULT); builder.configureXFrame(xFrameEnabled).setXFrameOption(xFrameOptionValue); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java index ca609970913d..52a60b4d1bef 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java @@ -17,7 +17,6 @@ package org.apache.hadoop.hdds.utils; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_RECON_HEARTBEAT_INTERVAL; @@ -41,6 +40,7 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL_DEFAULT; import static org.apache.hadoop.hdds.server.ServerUtils.sanitizeUserArgs; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_CONTAINER_DB_DIR; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import com.google.common.base.Strings; import com.google.protobuf.BlockingService; @@ -67,7 +67,6 @@ import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -580,7 +579,7 @@ public static MetricsSystem initializeMetrics( MetricsSystem metricsSystem = DefaultMetricsSystem.initialize(serverName); try { JvmMetrics.create(serverName, - configuration.get(DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY), + configuration.get(OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY), DefaultMetricsSystem.instance()); CpuMetrics.create(); } catch (MetricsException e) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java index facc913be325..0e116ec9ac73 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.client.ECReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -51,6 +50,7 @@ import org.apache.hadoop.hdds.scm.ha.SCMContext; import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException; import org.apache.hadoop.hdds.server.events.EventPublisher; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -273,8 +273,8 @@ public NodeDecommissionManager(OzoneConfiguration config, NodeManager nm, Contai ); useHostnames = config.getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); long monitorInterval = config.getTimeDuration( ScmConfigKeys.OZONE_SCM_DATANODE_ADMIN_MONITOR_INTERVAL, diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java index 5e897ed140dd..e55f6ab3e48a 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java @@ -50,7 +50,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.management.ObjectName; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState; @@ -84,6 +83,7 @@ import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.metrics2.util.MBeans; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.protocol.VersionResponse; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; @@ -182,8 +182,8 @@ public SCMNodeManager( this.clusterMap = networkTopology; this.nodeResolver = nodeResolver; this.useHostname = conf.getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); this.numPipelinesPerMetadataVolume = conf.getInt(ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME, ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME_DEFAULT); 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 106cf898799f..f9d35a13fbe4 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 @@ -58,7 +58,6 @@ import javax.management.ObjectName; import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.annotation.InterfaceAudience; @@ -723,7 +722,7 @@ private void initializeSystemManagers(OzoneConfiguration conf, Class dnsToSwitchMappingClass = conf.getClass( - DFSConfigKeysLegacy.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, TableMapping.class, DNSToSwitchMapping.class); DNSToSwitchMapping newInstance = ReflectionUtils.newInstance( dnsToSwitchMappingClass, conf); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java index 480ffb5c8f30..4b3b52c0bd59 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java @@ -69,7 +69,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; @@ -102,6 +101,7 @@ import org.apache.hadoop.hdds.server.events.EventPublisher; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; @@ -1828,7 +1828,7 @@ void testScmRegisterNodeWithNetworkTopology(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create table mapping file @@ -1942,7 +1942,7 @@ void testGetNodesByAddress(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create a set of hosts - note two hosts on "host1" diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java index 7992e3180aff..043db3beb168 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java @@ -38,7 +38,6 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.client.ContainerBlockID; import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; @@ -64,6 +63,7 @@ import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics; import org.apache.hadoop.net.StaticMapping; import org.apache.hadoop.ozone.ClientVersion; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.common.BlockGroup; import org.apache.hadoop.ozone.container.common.SCMTestUtils; import org.junit.jupiter.api.AfterEach; @@ -346,8 +346,8 @@ private List getNetworkNames() { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java index f92f03a70c74..deed9ebdf3ee 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java @@ -17,8 +17,8 @@ package org.apache.ozone.fs.http.server.metrics; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_METRICS_SESSION_ID_KEY; import static org.apache.hadoop.metrics2.impl.MsInfo.SessionId; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY; import java.util.concurrent.ThreadLocalRandom; import org.apache.hadoop.conf.Configuration; 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 15348f022e35..9a52a1567150 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 @@ -49,8 +49,8 @@ import java.util.concurrent.TimeoutException; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; 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 2f5f534c3f81..9bb9e8d364b5 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 @@ -54,8 +54,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; 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 a8fe45b11bbb..2692c271be60 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 @@ -67,8 +67,6 @@ import static java.util.Objects.requireNonNull; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; @@ -81,6 +79,8 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; 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 47d90d6d9ace..610b55b12165 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 @@ -52,8 +52,6 @@ import static java.time.Duration.between; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_KEYTAB_FILE_KEY; @@ -62,6 +60,8 @@ import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.security.symmetric.SecretKeyConfig.parseRotateDuration; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java index 28b78e8cd876..2f75f995d5e2 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java @@ -18,7 +18,6 @@ package org.apache.hadoop.ozone; import com.google.common.collect.ImmutableMap; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -185,8 +184,8 @@ private static void assertRackOrder(String rack, List list) { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java index fddaf79002ba..7cfa9af3d22f 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java @@ -33,7 +33,6 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.hadoop.hdds.DFSConfigKeysLegacy.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_HTTP_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS; @@ -48,6 +47,7 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_PORT; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_SERVER_PORT; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.ozone.test.GenericTestUtils.PortAllocator.anyHostWithFreePort; import static org.apache.ozone.test.GenericTestUtils.PortAllocator.getFreePort; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java index a05006b4691f..dc94da198291 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java @@ -25,7 +25,6 @@ import java.util.UUID; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.client.BlockID; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -91,7 +90,7 @@ public class TestContainerMetrics { @BeforeAll public static void setup() { DefaultMetricsSystem.setMiniClusterMode(true); - CONF.setInt(DFSConfigKeysLegacy.HDDS_METRICS_PERCENTILES_INTERVALS_KEY, + CONF.setInt(OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY, DFS_METRICS_PERCENTILES_INTERVALS); CONF.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED, false); CONF.set(OzoneConfigKeys.OZONE_METADATA_DIRS, testDir.toString()); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java index 6f90f8244083..a559ed061e1a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java @@ -104,7 +104,6 @@ import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension; import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension.EncryptedKeyVersion; import org.apache.hadoop.fs.FileEncryptionInfo; -import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -127,6 +126,7 @@ import org.apache.hadoop.net.TableMapping; import org.apache.hadoop.ozone.OmUtils; import org.apache.hadoop.ozone.OzoneAcl; +import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes; import org.apache.hadoop.ozone.om.helpers.BucketEncryptionKeyInfo; @@ -354,7 +354,7 @@ public void start(OzoneConfiguration configuration) { Class dnsToSwitchMappingClass = configuration.getClass( - DFSConfigKeysLegacy.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, TableMapping.class, DNSToSwitchMapping.class); DNSToSwitchMapping newInstance = ReflectionUtils.newInstance( dnsToSwitchMappingClass, configuration); @@ -1967,8 +1967,8 @@ private Node getClientNode(String clientMachine, List nodes) { List matchingNodes = new ArrayList<>(); boolean useHostname = ozoneManager.getConfiguration().getBoolean( - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME, - DFSConfigKeysLegacy.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); for (DatanodeDetails node : nodes) { if ((useHostname ? node.getHostName() : node.getIpAddress()).equals( clientMachine)) { From 70d5784ed08ebf922c9e4e366229d7a7b91f6f00 Mon Sep 17 00:00:00 2001 From: sarvekshayr Date: Tue, 18 Feb 2025 16:23:17 +0530 Subject: [PATCH 3/6] Corrected TestOzoneConfigurationFields --- .../hadoop/ozone/TestOzoneConfigurationFields.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 2c6b3df43ac0..cc7ef29a4b90 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 @@ -134,7 +134,19 @@ private void addPropertiesNotInXml() { HddsConfigKeys.HDDS_DATANODE_VOLUME_MIN_FREE_SPACE_PERCENT, OzoneConfigKeys.HDDS_SCM_CLIENT_RPC_TIME_OUT, OzoneConfigKeys.HDDS_SCM_CLIENT_MAX_RETRY_TIMEOUT, - OzoneConfigKeys.HDDS_SCM_CLIENT_FAILOVER_MAX_RETRY + OzoneConfigKeys.HDDS_SCM_CLIENT_FAILOVER_MAX_RETRY, + OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY, + OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY, + OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY, + OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, + OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED, + OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE, + OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY, + OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, + OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY )); } } From 9ae0d7e719179dd2319379ac0e5988c309f65224 Mon Sep 17 00:00:00 2001 From: sarvekshayr Date: Tue, 18 Feb 2025 18:14:34 +0530 Subject: [PATCH 4/6] Fixed checkstyle issue --- .../org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java | 4 ++-- .../java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 46208038cf5b..10c470f97ef0 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 @@ -18,8 +18,6 @@ package org.apache.hadoop.hdds.scm; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; @@ -29,6 +27,8 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; 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 ce272e5d5053..a97f681b0a99 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 @@ -19,8 +19,6 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; @@ -31,6 +29,8 @@ import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.utils.HddsServerUtil.getSecretKeyClientForDatanode; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; From a5bf15b65a67fb4678c0b88fc5180eb9fc29cfe7 Mon Sep 17 00:00:00 2001 From: sarvekshayr Date: Thu, 27 Feb 2025 14:12:06 +0530 Subject: [PATCH 5/6] Moved keys to HddsConfigKeys and ScmConfigKeys --- .../apache/hadoop/hdds/HddsConfigKeys.java | 28 ++++++++++++++++++ .../org/apache/hadoop/hdds/HddsUtils.java | 6 ++-- .../hadoop/hdds/conf/OzoneConfiguration.java | 25 ++++++++-------- .../apache/hadoop/hdds/ratis/RatisHelper.java | 6 ++-- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 4 +++ .../apache/hadoop/ozone/OzoneConfigKeys.java | 29 ------------------- .../hadoop/ozone/HddsDatanodeService.java | 9 +++--- .../common/helpers/ContainerMetrics.java | 4 +-- .../protocolPB/ReconDatanodeProtocolPB.java | 4 +-- .../StorageContainerDatanodeProtocolPB.java | 4 +-- .../hadoop/ozone/TestHddsDatanodeService.java | 2 +- .../ozone/TestHddsSecureDatanodeInit.java | 2 +- .../common/volume/TestVolumeSet.java | 2 +- .../volume/TestVolumeSetDiskChecks.java | 6 ++-- .../protocol/SecretKeyProtocolDatanode.java | 2 +- .../ReconfigureProtocolDatanodePB.java | 4 +-- .../SecretKeyProtocolDatanodePB.java | 2 +- .../hdds/server/http/BaseHttpServer.java | 8 ++--- .../hadoop/hdds/utils/HddsServerUtil.java | 5 ++-- .../scm/node/NodeDecommissionManager.java | 6 ++-- .../hadoop/hdds/scm/node/SCMNodeManager.java | 6 ++-- .../scm/server/StorageContainerManager.java | 2 +- .../hdds/scm/node/TestSCMNodeManager.java | 5 ++-- .../server/TestSCMBlockProtocolServer.java | 6 ++-- .../server/metrics/HttpFSServerMetrics.java | 2 +- .../hdds/scm/TestSecretKeySnapshot.java | 4 +-- .../hadoop/hdds/scm/TestSecretKeysApi.java | 4 +-- .../apache/hadoop/ozone/TestBlockTokens.java | 4 +-- .../hadoop/ozone/TestBlockTokensCLI.java | 4 +-- .../hadoop/ozone/TestOMSortDatanodes.java | 4 +-- .../ozone/TestOzoneConfigurationFields.java | 24 +++++++-------- .../hadoop/ozone/UniformDatanodesFactory.java | 2 +- .../metrics/TestContainerMetrics.java | 3 +- .../hadoop/ozone/om/KeyManagerImpl.java | 9 +++--- 34 files changed, 122 insertions(+), 115 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java index a2aae1936ca0..eb63a60bb1d1 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java @@ -405,4 +405,32 @@ private HddsConfigKeys() { public static final String OZONE_DATANODE_IO_METRICS_PERCENTILES_INTERVALS_SECONDS_KEY = "ozone.volume.io.percentiles.intervals.seconds"; + + public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = + "hdds.datanode.dns.interface"; + public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = + "hdds.datanode.dns.nameserver"; + public static final String HDDS_DATANODE_HOST_NAME_KEY = + "hdds.datanode.hostname"; + public static final String HDDS_DATANODE_DATA_DIR_KEY = + "hdds.datanode.data.dir"; + public static final String HDDS_DATANODE_USE_DN_HOSTNAME = + "hdds.datanode.use.datanode.hostname"; + public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; + + public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; + public static final boolean HDDS_XFRAME_OPTION_ENABLED_DEFAULT = true; + public static final String HDDS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; + public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; + + public static final String HDDS_METRICS_SESSION_ID_KEY = + "hdds.metrics.session-id"; + + public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = + "hdds.datanode.kerberos.principal"; + public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = + "hdds.datanode.kerberos.keytab.file"; + public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = + "hdds.metrics.percentiles.intervals"; + } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java index c9c7c793b2bc..04fc4356e1ec 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java @@ -22,6 +22,9 @@ import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_BIND_HOST_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_PORT_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_PORT_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_HOST_NAME_KEY; import static org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_ADDRESS_KEY; import static org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_DATANODE_PORT_DEFAULT; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_ADDRESS_KEY; @@ -31,9 +34,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_DEFAULT; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DATANODE_PORT_KEY; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY; import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java index 0289a2529635..58f33d445acd 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java @@ -47,6 +47,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource; @@ -314,7 +315,7 @@ private static void addDeprecatedKeys() { HDDS_DATANODE_RATIS_PREFIX_KEY + "." + RaftServerConfigKeys.PREFIX + "." + "rpc.slowness.timeout"), new DeprecationDelta("dfs.datanode.keytab.file", - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("ozone.scm.chunk.layout", ScmConfigKeys.OZONE_SCM_CONTAINER_LAYOUT_KEY), new DeprecationDelta("hdds.datanode.replication.work.dir", @@ -380,21 +381,21 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.ratis.snapshot.threshold", ScmConfigKeys.HDDS_RATIS_SNAPSHOT_THRESHOLD_KEY), new DeprecationDelta("dfs.datanode.dns.interface", - OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY), + HddsConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY), new DeprecationDelta("dfs.datanode.dns.nameserver", - OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY), + HddsConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY), new DeprecationDelta("dfs.datanode.hostname", - OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY), + HddsConfigKeys.HDDS_DATANODE_HOST_NAME_KEY), new DeprecationDelta("dfs.datanode.data.dir", - OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY), + HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY), new DeprecationDelta("dfs.datanode.use.datanode.hostname", - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME), + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME), new DeprecationDelta("dfs.xframe.enabled", - OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED), + HddsConfigKeys.HDDS_XFRAME_OPTION_ENABLED), new DeprecationDelta("dfs.xframe.value", - OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE), + HddsConfigKeys.HDDS_XFRAME_OPTION_VALUE), new DeprecationDelta("dfs.metrics.session-id", - OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY), + HddsConfigKeys.HDDS_METRICS_SESSION_ID_KEY), new DeprecationDelta("dfs.client.https.keystore.resource", OzoneConfigKeys.OZONE_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY), new DeprecationDelta("dfs.https.server.keystore.resource", @@ -402,11 +403,11 @@ private static void addDeprecatedKeys() { new DeprecationDelta("dfs.http.policy", OzoneConfigKeys.OZONE_HTTP_POLICY_KEY), new DeprecationDelta("dfs.datanode.kerberos.principal", - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), + HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), new DeprecationDelta("dfs.datanode.kerberos.keytab.file", - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), + HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY), new DeprecationDelta("dfs.metrics.percentiles.intervals", - OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY), + HddsConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY), }); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java index f0cf0859412b..bcff6e6071a1 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/ratis/RatisHelper.java @@ -34,6 +34,7 @@ import java.util.function.BooleanSupplier; import java.util.stream.Collectors; import javax.net.ssl.TrustManager; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.StringUtils; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -44,7 +45,6 @@ import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.hdds.security.SecurityConfig; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.ratis.RaftConfigKeys; import org.apache.ratis.client.RaftClient; import org.apache.ratis.client.RaftClientConfigKeys; @@ -450,8 +450,8 @@ public static Long getMinReplicatedIndex( private static boolean datanodeUseHostName() { return CONF.getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); } private static Class getClass(String name, 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 cda2133269d6..02c1748dc2d2 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 @@ -629,6 +629,10 @@ public final class ScmConfigKeys { "ozone.scm.ha.dbtransactionbuffer.flush.interval"; public static final long OZONE_SCM_HA_DBTRANSACTIONBUFFER_FLUSH_INTERVAL_DEFAULT = 600 * 1000L; + + public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = + "net.topology.node.switch.mapping.impl"; + /** * Never constructed. */ diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java index a37f65105619..5dc4e15fc0d6 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java @@ -595,35 +595,6 @@ public final class OzoneConfigKeys { OZONE_CLIENT_BUCKET_REPLICATION_CONFIG_REFRESH_PERIOD_DEFAULT_MS = 300 * 1000; - public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = - "hdds.datanode.dns.interface"; - public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = - "hdds.datanode.dns.nameserver"; - public static final String HDDS_DATANODE_HOST_NAME_KEY = - "hdds.datanode.hostname"; - public static final String HDDS_DATANODE_DATA_DIR_KEY = - "hdds.datanode.data.dir"; - public static final String HDDS_DATANODE_USE_DN_HOSTNAME = - "hdds.datanode.use.datanode.hostname"; - public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; - - public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; - public static final boolean HDDS_XFRAME_OPTION_ENABLED_DEFAULT = true; - public static final String HDDS_XFRAME_OPTION_VALUE = "hdds.xframe.value"; - public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; - - public static final String HDDS_METRICS_SESSION_ID_KEY = - "hdds.metrics.session-id"; - public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = - "net.topology.node.switch.mapping.impl"; - - public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = - "hdds.datanode.kerberos.principal"; - public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = - "hdds.datanode.kerberos.keytab.file"; - public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = - "hdds.metrics.percentiles.intervals"; - // Values for bucket layout configurations. public static final String OZONE_BUCKET_LAYOUT_LEGACY = "LEGACY"; diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 3b2adc05b48e..eee15d20fabc 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -45,6 +45,7 @@ import javax.management.ObjectName; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.hdds.DatanodeVersion; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.hdds.cli.HddsVersionProvider; @@ -248,16 +249,16 @@ public String getNamespace() { UserGroupInformation.AuthenticationMethod.KERBEROS)) { LOG.info("Ozone security is enabled. Attempting login for Hdds " + "Datanode user. Principal: {},keytab: {}", conf.get( - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), + HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY), conf.get( - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); + HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY)); UserGroupInformation.setConfiguration(conf); SecurityUtil .login(conf, - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, + HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, hostname); } else { throw new AuthenticationException(SecurityUtil. diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java index 06c25b6fdabb..d37a8626cfd0 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerMetrics.java @@ -19,6 +19,7 @@ import java.io.Closeable; import java.util.EnumMap; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; @@ -30,7 +31,6 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableQuantiles; import org.apache.hadoop.metrics2.lib.MutableRate; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.util.MetricUtil; /** @@ -94,7 +94,7 @@ public static ContainerMetrics create(ConfigurationSource conf) { MetricsSystem ms = DefaultMetricsSystem.instance(); // Percentile measurement is off by default, by watching no intervals int[] intervals = - conf.getInts(OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY); + conf.getInts(HddsConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY); return ms.register(STORAGE_CONTAINER_METRICS, "Storage Container Node Metrics", new ContainerMetrics(intervals)); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java index f532bec68621..d55587c457cf 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/ReconDatanodeProtocolPB.java @@ -19,8 +19,8 @@ import static org.apache.hadoop.hdds.recon.ReconConfig.ConfigStrings.OZONE_RECON_KERBEROS_PRINCIPAL_KEY; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.ipc.ProtocolInfo; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -32,7 +32,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = OZONE_RECON_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconDatanodeProtocolPB extends StorageContainerDatanodeProtocolPB { } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java index e932a4151a54..c20a90fe3a2b 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolPB.java @@ -17,10 +17,10 @@ package org.apache.hadoop.ozone.protocolPB; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageContainerDatanodeProtocolService; import org.apache.hadoop.hdds.scm.ScmConfig; import org.apache.hadoop.ipc.ProtocolInfo; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -33,7 +33,7 @@ protocolVersion = 1) @KerberosInfo( serverPrincipal = ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY, - clientPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) + clientPrincipal = HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface StorageContainerDatanodeProtocolPB extends StorageContainerDatanodeProtocolService.BlockingInterface { } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java index 7cae7c18126e..7547036a59fd 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java @@ -98,7 +98,7 @@ public void setUp() throws IOException { conf.setBoolean(HDDS_CONTAINER_TOKEN_ENABLED, true); String volumeDir = testDir + OZONE_URI_DELIMITER + "disk1"; - conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); } @ParameterizedTest diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java index 83e1f230e5d4..ec64da763786 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java @@ -97,7 +97,7 @@ public static void setUp() throws Exception { conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath()); //conf.set(ScmConfigKeys.OZONE_SCM_NAMES, "localhost"); String volumeDir = testDir + "/disk1"; - conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); + conf.set(HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, volumeDir); conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true); conf.setClass(OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY, diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java index e15ce30a879d..f55286c91c17 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java @@ -76,7 +76,7 @@ public void setup() throws Exception { String dataDirKey = volume1 + "," + volume2; volumes.add(volume1); volumes.add(volume2); - conf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, dataDirKey); + conf.set(HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, dataDirKey); conf.set(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATANODE_STORAGE_DIR, dataDirKey); initializeVolumeSet(); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java index 7286c5961fbe..4f1838ce9f7f 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSetDiskChecks.java @@ -90,7 +90,7 @@ public class TestVolumeSetDiskChecks { @AfterEach public void cleanup() { final Collection dirs = conf.getTrimmedStringCollection( - OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); + HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); for (String d: dirs) { FileUtils.deleteQuietly(new File(d)); @@ -115,7 +115,7 @@ public void testOzoneDirsAreCreated() throws IOException { // Verify that the Ozone dirs were created during initialization. Collection dirs = conf.getTrimmedStringCollection( - OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); + HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY); for (String d : dirs) { assertTrue(new File(d).isDirectory()); } @@ -222,7 +222,7 @@ private OzoneConfiguration getConfWithDataNodeDirs(int numDirs) { for (int i = 0; i < numDirs; ++i) { dirs.add(new File(dir, randomAlphanumeric(10)).toString()); } - ozoneConf.set(OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, + ozoneConf.set(HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, String.join(",", dirs)); final List metaDirs = new ArrayList<>(); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java index dff1edf5d849..66af07484a0a 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SecretKeyProtocolDatanode.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocol; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.security.KerberosInfo; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java index ec214fcd33d9..78b2c221e428 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/ReconfigureProtocolDatanodePB.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocolPB; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.ipc.ProtocolInfo; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.security.KerberosInfo; /** @@ -28,6 +28,6 @@ @ProtocolInfo( protocolName = "org.apache.hadoop.hdds.protocol.ReconfigureProtocol", protocolVersion = 1) -@KerberosInfo(serverPrincipal = OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) +@KerberosInfo(serverPrincipal = HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY) public interface ReconfigureProtocolDatanodePB extends ReconfigureProtocolPB { } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java index 1ad11114af5d..fc07daaf4381 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SecretKeyProtocolDatanodePB.java @@ -17,8 +17,8 @@ package org.apache.hadoop.hdds.protocolPB; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import org.apache.hadoop.hdds.protocol.proto.SCMSecretKeyProtocolProtos.SCMSecretKeyProtocolService; import org.apache.hadoop.ipc.ProtocolInfo; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java index dba2d8f04ffd..3144fd63ac58 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java @@ -127,12 +127,12 @@ public BaseHttpServer(MutableConfigurationSource conf, String name) } final boolean xFrameEnabled = conf.getBoolean( - OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED, - OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED_DEFAULT); + HddsConfigKeys.HDDS_XFRAME_OPTION_ENABLED, + HddsConfigKeys.HDDS_XFRAME_OPTION_ENABLED_DEFAULT); final String xFrameOptionValue = conf.getTrimmed( - OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE, - OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE_DEFAULT); + HddsConfigKeys.HDDS_XFRAME_OPTION_VALUE, + HddsConfigKeys.HDDS_XFRAME_OPTION_VALUE_DEFAULT); builder.configureXFrame(xFrameEnabled).setXFrameOption(xFrameOptionValue); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java index 52a60b4d1bef..024fdd318c6b 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java @@ -17,6 +17,7 @@ package org.apache.hadoop.hdds.utils; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL_DEFAULT; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_RECON_HEARTBEAT_INTERVAL; @@ -40,7 +41,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL_DEFAULT; import static org.apache.hadoop.hdds.server.ServerUtils.sanitizeUserArgs; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_CONTAINER_DB_DIR; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import com.google.common.base.Strings; import com.google.protobuf.BlockingService; @@ -67,6 +67,7 @@ import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -579,7 +580,7 @@ public static MetricsSystem initializeMetrics( MetricsSystem metricsSystem = DefaultMetricsSystem.initialize(serverName); try { JvmMetrics.create(serverName, - configuration.get(OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY), + configuration.get(HddsConfigKeys.HDDS_METRICS_SESSION_ID_KEY), DefaultMetricsSystem.instance()); CpuMetrics.create(); } catch (MetricsException e) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java index 0e116ec9ac73..a4deae441fb9 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java @@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.ECReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -50,7 +51,6 @@ import org.apache.hadoop.hdds.scm.ha.SCMContext; import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException; import org.apache.hadoop.hdds.server.events.EventPublisher; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -273,8 +273,8 @@ public NodeDecommissionManager(OzoneConfiguration config, NodeManager nm, Contai ); useHostnames = config.getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); long monitorInterval = config.getTimeDuration( ScmConfigKeys.OZONE_SCM_DATANODE_ADMIN_MONITOR_INTERVAL, diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java index e55f6ab3e48a..3efaf4bba4db 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java @@ -50,6 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.management.ObjectName; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState; @@ -83,7 +84,6 @@ import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.metrics2.util.MBeans; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.protocol.VersionResponse; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; @@ -182,8 +182,8 @@ public SCMNodeManager( this.clusterMap = networkTopology; this.nodeResolver = nodeResolver; this.useHostname = conf.getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); this.numPipelinesPerMetadataVolume = conf.getInt(ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME, ScmConfigKeys.OZONE_SCM_PIPELINE_PER_METADATA_VOLUME_DEFAULT); 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 f9d35a13fbe4..1b67402b5a82 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 @@ -722,7 +722,7 @@ private void initializeSystemManagers(OzoneConfiguration conf, Class dnsToSwitchMappingClass = conf.getClass( - OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + ScmConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, TableMapping.class, DNSToSwitchMapping.class); DNSToSwitchMapping newInstance = ReflectionUtils.newInstance( dnsToSwitchMappingClass, conf); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java index 4b3b52c0bd59..e2b9136edbad 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java @@ -101,7 +101,6 @@ import org.apache.hadoop.hdds.server.events.EventPublisher; import org.apache.hadoop.hdds.server.events.EventQueue; import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand; import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode; @@ -1828,7 +1827,7 @@ void testScmRegisterNodeWithNetworkTopology(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create table mapping file @@ -1942,7 +1941,7 @@ void testGetNodesByAddress(boolean useHostname) OzoneConfiguration conf = getConf(); conf.setTimeDuration(OZONE_SCM_HEARTBEAT_PROCESS_INTERVAL, 1000, MILLISECONDS); - conf.setBoolean(OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + conf.setBoolean(HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); // create a set of hosts - note two hosts on "host1" diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java index 043db3beb168..895baef27d6c 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java @@ -38,6 +38,7 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.ContainerBlockID; import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; @@ -63,7 +64,6 @@ import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics; import org.apache.hadoop.net.StaticMapping; import org.apache.hadoop.ozone.ClientVersion; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.common.BlockGroup; import org.apache.hadoop.ozone.container.common.SCMTestUtils; import org.junit.jupiter.api.AfterEach; @@ -346,8 +346,8 @@ private List getNetworkNames() { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java index deed9ebdf3ee..5b2d28b02c0c 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java @@ -17,8 +17,8 @@ package org.apache.ozone.fs.http.server.metrics; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_METRICS_SESSION_ID_KEY; import static org.apache.hadoop.metrics2.impl.MsInfo.SessionId; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY; import java.util.concurrent.ThreadLocalRandom; import org.apache.hadoop.conf.Configuration; 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 10c470f97ef0..384c4e33190f 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 @@ -19,6 +19,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_DURATION; @@ -27,8 +29,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; 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 a97f681b0a99..0e069e108812 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 @@ -20,6 +20,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_DURATION; @@ -29,8 +31,6 @@ import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.utils.HddsServerUtil.getSecretKeyClientForDatanode; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; 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 cfc042f5519f..752d2894da19 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 @@ -21,6 +21,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_EXPIRY_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_CHECK_DURATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECRET_KEY_ROTATE_DURATION; @@ -31,8 +33,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; 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 d52c262216a4..393009d18e86 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 @@ -21,14 +21,14 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_TOKEN_ENABLED; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.ScmConfig.ConfigStrings.HDDS_SCM_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig.ConfigStrings.HDDS_SCM_HTTP_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.hdds.security.symmetric.SecretKeyConfig.parseRotateDuration; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_KEYTAB_FILE; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java index 49425d0d93d8..c7f7a843fee4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOMSortDatanodes.java @@ -182,8 +182,8 @@ private static void assertRackOrder(String rack, List list) { private String nodeAddress(DatanodeDetails dn) { boolean useHostname = config.getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); return useHostname ? dn.getHostName() : dn.getIpAddress(); } } 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 0b44dc0daeba..63afb9aed66e 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 @@ -133,18 +133,18 @@ private void addPropertiesNotInXml() { OzoneConfigKeys.HDDS_SCM_CLIENT_RPC_TIME_OUT, OzoneConfigKeys.HDDS_SCM_CLIENT_MAX_RETRY_TIMEOUT, OzoneConfigKeys.HDDS_SCM_CLIENT_FAILOVER_MAX_RETRY, - OzoneConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY, - OzoneConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY, - OzoneConfigKeys.HDDS_DATANODE_HOST_NAME_KEY, - OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_XFRAME_OPTION_ENABLED, - OzoneConfigKeys.HDDS_XFRAME_OPTION_VALUE, - OzoneConfigKeys.HDDS_METRICS_SESSION_ID_KEY, - OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, - OzoneConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, - OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY + HddsConfigKeys.HDDS_DATANODE_DNS_INTERFACE_KEY, + HddsConfigKeys.HDDS_DATANODE_DNS_NAMESERVER_KEY, + HddsConfigKeys.HDDS_DATANODE_HOST_NAME_KEY, + HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_XFRAME_OPTION_ENABLED, + HddsConfigKeys.HDDS_XFRAME_OPTION_VALUE, + HddsConfigKeys.HDDS_METRICS_SESSION_ID_KEY, + ScmConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + HddsConfigKeys.HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY, + HddsConfigKeys.HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY, + HddsConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY )); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java index 6f91447b14ee..e9672bc601e5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java @@ -18,6 +18,7 @@ package org.apache.hadoop.ozone; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_CLIENT_ADDRESS_KEY; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_HTTP_ADDRESS_KEY; import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_DU_RESERVED; @@ -31,7 +32,6 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_PORT; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_IPC_PORT; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_RATIS_SERVER_PORT; -import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_DATA_DIR_KEY; import static org.apache.ozone.test.GenericTestUtils.PortAllocator.anyHostWithFreePort; import static org.apache.ozone.test.GenericTestUtils.PortAllocator.getFreePort; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java index fbcbce15fe03..ebb4cca97ef1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/metrics/TestContainerMetrics.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.io.FileUtils; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.BlockID; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -88,7 +89,7 @@ public class TestContainerMetrics { @BeforeAll public static void setup() { DefaultMetricsSystem.setMiniClusterMode(true); - CONF.setInt(OzoneConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY, + CONF.setInt(HddsConfigKeys.HDDS_METRICS_PERCENTILES_INTERVALS_KEY, DFS_METRICS_PERCENTILES_INTERVALS); CONF.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED, false); CONF.set(OzoneConfigKeys.OZONE_METADATA_DIRS, testDir.toString()); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java index a559ed061e1a..2c37315dec9c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java @@ -104,10 +104,12 @@ import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension; import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension.EncryptedKeyVersion; import org.apache.hadoop.fs.FileEncryptionInfo; +import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline; import org.apache.hadoop.hdds.scm.net.InnerNode; import org.apache.hadoop.hdds.scm.net.Node; @@ -126,7 +128,6 @@ import org.apache.hadoop.net.TableMapping; import org.apache.hadoop.ozone.OmUtils; import org.apache.hadoop.ozone.OzoneAcl; -import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes; import org.apache.hadoop.ozone.om.helpers.BucketEncryptionKeyInfo; @@ -354,7 +355,7 @@ public void start(OzoneConfiguration configuration) { Class dnsToSwitchMappingClass = configuration.getClass( - OzoneConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, + ScmConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, TableMapping.class, DNSToSwitchMapping.class); DNSToSwitchMapping newInstance = ReflectionUtils.newInstance( dnsToSwitchMappingClass, configuration); @@ -1967,8 +1968,8 @@ private Node getClientNode(String clientMachine, List nodes) { List matchingNodes = new ArrayList<>(); boolean useHostname = ozoneManager.getConfiguration().getBoolean( - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, - OzoneConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, + HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT); for (DatanodeDetails node : nodes) { if ((useHostname ? node.getHostName() : node.getIpAddress()).equals( clientMachine)) { From f5580a355ce86ba6029d503c7419a446f95966cd Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:40:44 +0100 Subject: [PATCH 6/6] Fix indent --- .../org/apache/hadoop/hdds/HddsConfigKeys.java | 18 +++++++++--------- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java index eb63a60bb1d1..d516cd5f2776 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java @@ -407,15 +407,15 @@ private HddsConfigKeys() { "ozone.volume.io.percentiles.intervals.seconds"; public static final String HDDS_DATANODE_DNS_INTERFACE_KEY = - "hdds.datanode.dns.interface"; + "hdds.datanode.dns.interface"; public static final String HDDS_DATANODE_DNS_NAMESERVER_KEY = - "hdds.datanode.dns.nameserver"; + "hdds.datanode.dns.nameserver"; public static final String HDDS_DATANODE_HOST_NAME_KEY = - "hdds.datanode.hostname"; + "hdds.datanode.hostname"; public static final String HDDS_DATANODE_DATA_DIR_KEY = - "hdds.datanode.data.dir"; + "hdds.datanode.data.dir"; public static final String HDDS_DATANODE_USE_DN_HOSTNAME = - "hdds.datanode.use.datanode.hostname"; + "hdds.datanode.use.datanode.hostname"; public static final boolean HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; public static final String HDDS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled"; @@ -424,13 +424,13 @@ private HddsConfigKeys() { public static final String HDDS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN"; public static final String HDDS_METRICS_SESSION_ID_KEY = - "hdds.metrics.session-id"; + "hdds.metrics.session-id"; public static final String HDDS_DATANODE_KERBEROS_PRINCIPAL_KEY = - "hdds.datanode.kerberos.principal"; + "hdds.datanode.kerberos.principal"; public static final String HDDS_DATANODE_KERBEROS_KEYTAB_FILE_KEY = - "hdds.datanode.kerberos.keytab.file"; + "hdds.datanode.kerberos.keytab.file"; public static final String HDDS_METRICS_PERCENTILES_INTERVALS_KEY = - "hdds.metrics.percentiles.intervals"; + "hdds.metrics.percentiles.intervals"; } 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 02c1748dc2d2..941df45c2df6 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 @@ -631,7 +631,7 @@ public final class ScmConfigKeys { OZONE_SCM_HA_DBTRANSACTIONBUFFER_FLUSH_INTERVAL_DEFAULT = 600 * 1000L; public static final String NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY = - "net.topology.node.switch.mapping.impl"; + "net.topology.node.switch.mapping.impl"; /** * Never constructed.