adoroszlai commented on code in PR #7803:
URL: https://github.com/apache/ozone/pull/7803#discussion_r1943358602
##########
hadoop-ozone/dist/src/main/compose/common/security.conf:
##########
@@ -36,10 +36,10 @@
OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/s...@example.com
OZONE-SITE.XML_ozone.httpfs.kerberos.keytab.file=/etc/security/keytabs/httpfs.keytab
OZONE-SITE.XML_ozone.httpfs.kerberos.principal=httpfs/htt...@example.com
-HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/d...@example.com
-HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab
+HDFS-SITE.XML_hdds.datanode.kerberos.principal=dn/d...@example.com
+HDFS-SITE.XML_hdds.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab
HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/oz...@example.com
-HDFS-SITE.XML_dfs.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
+HDFS-SITE.XML_hdds.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
Review Comment:
Similarly, this is used in `upgrade` acceptance test, running older version
to upgrade from. Keep old config keys.
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java:
##########
@@ -29,58 +29,58 @@ private DFSConfigKeysLegacy() {
}
public static final String DFS_DATANODE_DNS_INTERFACE_KEY =
- "dfs.datanode.dns.interface";
+ "hdds.datanode.dns.interface";
public static final String DFS_DATANODE_DNS_NAMESERVER_KEY =
- "dfs.datanode.dns.nameserver";
+ "hdds.datanode.dns.nameserver";
public static final String DFS_DATANODE_HOST_NAME_KEY =
- "dfs.datanode.hostname";
+ "hdds.datanode.hostname";
public static final String DFS_DATANODE_DATA_DIR_KEY =
- "dfs.datanode.data.dir";
+ "hdds.datanode.data.dir";
public static final String DFS_DATANODE_USE_DN_HOSTNAME =
- "dfs.datanode.use.datanode.hostname";
+ "hdds.datanode.use.datanode.hostname";
public static final boolean DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false;
- public static final String DFS_XFRAME_OPTION_ENABLED = "dfs.xframe.enabled";
+ public static final String DFS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled";
public static final boolean DFS_XFRAME_OPTION_ENABLED_DEFAULT = true;
- public static final String DFS_XFRAME_OPTION_VALUE = "dfs.xframe.value";
+ public static final String DFS_XFRAME_OPTION_VALUE = "hdds.xframe.value";
public static final String DFS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN";
public static final String DFS_METRICS_SESSION_ID_KEY =
- "dfs.metrics.session-id";
+ "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_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.client.https.keystore.resource";
+ "hdds.client.https.keystore.resource";
public static final String DFS_SERVER_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.https.server.keystore.resource";
+ "hdds.https.server.keystore.resource";
- public static final String DFS_HTTP_POLICY_KEY = "dfs.http.policy";
+ public static final String DFS_HTTP_POLICY_KEY = "hdds.http.policy";
public static final String DFS_DATANODE_KERBEROS_PRINCIPAL_KEY =
- "dfs.datanode.kerberos.principal";
+ "hdds.datanode.kerberos.principal";
@Deprecated
public static final String DFS_DATANODE_KEYTAB_FILE_KEY =
- "dfs.datanode.keytab.file";
+ "hdds.datanode.keytab.file";
public static final String DFS_DATANODE_KERBEROS_KEYTAB_FILE_KEY =
- "dfs.datanode.kerberos.keytab.file";
+ "hdds.datanode.kerberos.keytab.file";
Review Comment:
`dfs.datanode.keytab.file` is already deprecated in favor of
`dfs.datanode.kerberos.keytab.file`. So we can remove
`DFS_DATANODE_KEYTAB_FILE_KEY`.
##########
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java:
##########
@@ -48,7 +48,7 @@
public class HttpFSServerMetrics {
private static final String DFS_METRICS_SESSION_ID_KEY
- = "dfs.metrics.session-id";
+ = "hdds.metrics.session-id";
Review Comment:
This can be removed in HDDS-12172, and use global constant instead.
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java:
##########
@@ -29,58 +29,58 @@ private DFSConfigKeysLegacy() {
}
public static final String DFS_DATANODE_DNS_INTERFACE_KEY =
- "dfs.datanode.dns.interface";
+ "hdds.datanode.dns.interface";
public static final String DFS_DATANODE_DNS_NAMESERVER_KEY =
- "dfs.datanode.dns.nameserver";
+ "hdds.datanode.dns.nameserver";
public static final String DFS_DATANODE_HOST_NAME_KEY =
- "dfs.datanode.hostname";
+ "hdds.datanode.hostname";
public static final String DFS_DATANODE_DATA_DIR_KEY =
- "dfs.datanode.data.dir";
+ "hdds.datanode.data.dir";
public static final String DFS_DATANODE_USE_DN_HOSTNAME =
- "dfs.datanode.use.datanode.hostname";
+ "hdds.datanode.use.datanode.hostname";
public static final boolean DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false;
- public static final String DFS_XFRAME_OPTION_ENABLED = "dfs.xframe.enabled";
+ public static final String DFS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled";
public static final boolean DFS_XFRAME_OPTION_ENABLED_DEFAULT = true;
- public static final String DFS_XFRAME_OPTION_VALUE = "dfs.xframe.value";
+ public static final String DFS_XFRAME_OPTION_VALUE = "hdds.xframe.value";
public static final String DFS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN";
public static final String DFS_METRICS_SESSION_ID_KEY =
- "dfs.metrics.session-id";
+ "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_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.client.https.keystore.resource";
+ "hdds.client.https.keystore.resource";
public static final String DFS_SERVER_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.https.server.keystore.resource";
+ "hdds.https.server.keystore.resource";
- public static final String DFS_HTTP_POLICY_KEY = "dfs.http.policy";
+ public static final String DFS_HTTP_POLICY_KEY = "hdds.http.policy";
Review Comment:
We already have `ozone.http.policy`. I think deprecation of
`dfs.http.policy` should refer to that one, and this constant can be removed
without replacement.
##########
hadoop-ozone/dist/src/main/compose/xcompat/docker-config:
##########
@@ -74,11 +74,11 @@
OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/s...@example.com
OZONE-SITE.XML_ozone.httpfs.kerberos.keytab.file=/etc/security/keytabs/httpfs.keytab
OZONE-SITE.XML_ozone.httpfs.kerberos.principal=httpfs/htt...@example.com
-HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/d...@example.com
+HDFS-SITE.XML_hdds.datanode.kerberos.principal=dn/d...@example.com
HDFS-SITE.XML_dfs.datanode.keytab.file=/etc/security/keytabs/dn.keytab
-HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab
+HDFS-SITE.XML_hdds.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab
HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/oz...@example.com
-HDFS-SITE.XML_dfs.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
+HDFS-SITE.XML_hdds.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
Review Comment:
`xcompat` test runs older versions with this config, so we should keep using
the deprecated config keys here.
##########
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/DFSConfigKeysLegacy.java:
##########
@@ -29,58 +29,58 @@ private DFSConfigKeysLegacy() {
}
public static final String DFS_DATANODE_DNS_INTERFACE_KEY =
- "dfs.datanode.dns.interface";
+ "hdds.datanode.dns.interface";
public static final String DFS_DATANODE_DNS_NAMESERVER_KEY =
- "dfs.datanode.dns.nameserver";
+ "hdds.datanode.dns.nameserver";
public static final String DFS_DATANODE_HOST_NAME_KEY =
- "dfs.datanode.hostname";
+ "hdds.datanode.hostname";
public static final String DFS_DATANODE_DATA_DIR_KEY =
- "dfs.datanode.data.dir";
+ "hdds.datanode.data.dir";
public static final String DFS_DATANODE_USE_DN_HOSTNAME =
- "dfs.datanode.use.datanode.hostname";
+ "hdds.datanode.use.datanode.hostname";
public static final boolean DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false;
- public static final String DFS_XFRAME_OPTION_ENABLED = "dfs.xframe.enabled";
+ public static final String DFS_XFRAME_OPTION_ENABLED = "hdds.xframe.enabled";
public static final boolean DFS_XFRAME_OPTION_ENABLED_DEFAULT = true;
- public static final String DFS_XFRAME_OPTION_VALUE = "dfs.xframe.value";
+ public static final String DFS_XFRAME_OPTION_VALUE = "hdds.xframe.value";
public static final String DFS_XFRAME_OPTION_VALUE_DEFAULT = "SAMEORIGIN";
public static final String DFS_METRICS_SESSION_ID_KEY =
- "dfs.metrics.session-id";
+ "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_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.client.https.keystore.resource";
+ "hdds.client.https.keystore.resource";
public static final String DFS_SERVER_HTTPS_KEYSTORE_RESOURCE_KEY =
- "dfs.https.server.keystore.resource";
+ "hdds.https.server.keystore.resource";
Review Comment:
These two related to keystore are also unused. @fapifta may know if any new
keys were added as replacement without deprecation. If so, deprecation should
reference those. If not, we probably don't need to add deprecation for these.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org
For additional commands, e-mail: issues-h...@ozone.apache.org
