This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new fdebdacc18 HDDS-12761. Add missing network configuration properties in
ozone-default.xml (#8257)
fdebdacc18 is described below
commit fdebdacc18c29064cf6fd941870f1320afbaffa4
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Thu Apr 10 15:22:47 2025 -0700
HDDS-12761. Add missing network configuration properties in
ozone-default.xml (#8257)
---
.../org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 4 ---
.../common/src/main/resources/ozone-default.xml | 34 +++++++++++++++-------
.../hadoop/ozone/TestOzoneConfigurationFields.java | 2 --
.../hadoop/ozone/UniformDatanodesFactory.java | 2 --
4 files changed, 24 insertions(+), 18 deletions(-)
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 3cc9d1f3e4..c6abf7062a 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
@@ -220,10 +220,6 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_HTTP_BIND_HOST_DEFAULT = "0.0.0.0";
public static final int OZONE_SCM_HTTP_BIND_PORT_DEFAULT = 9876;
public static final int OZONE_SCM_HTTPS_BIND_PORT_DEFAULT = 9877;
-
- public static final String HDDS_REST_HTTP_ADDRESS_KEY =
- "hdds.rest.http-address";
- public static final String HDDS_REST_HTTP_ADDRESS_DEFAULT = "0.0.0.0:9880";
public static final String HDDS_DATANODE_DIR_KEY = "hdds.datanode.dir";
public static final String HDDS_DATANODE_DIR_DU_RESERVED =
"hdds.datanode.dir.du.reserved";
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index b15b5a43f2..ccd04eb840 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1518,12 +1518,6 @@
</description>
</property>
- <property>
- <name>hdds.rest.http-address</name>
- <value>0.0.0.0:9880</value>
- <description>The http address of Object Store REST server inside the
- datanode.</description>
- </property>
<property>
<name>hdds.datanode.plugins</name>
<value/>
@@ -1844,10 +1838,11 @@
<property>
<name>ozone.s3g.https-address</name>
- <value/>
+ <value>0.0.0.0:9879</value>
<tag>OZONE, S3GATEWAY</tag>
- <description>Ozone S3Gateway serverHTTPS server address and port
- .</description>
+ <description>
+ Ozone S3Gateway HTTPS server address and port.
+ </description>
</property>
<property>
@@ -1869,7 +1864,7 @@
<property>
<name>ozone.s3g.webadmin.https-address</name>
- <value/>
+ <value>0.0.0.0:19879</value>
<tag>OZONE, S3GATEWAY</tag>
<description>Ozone S3Gateway content server's HTTPS address and
port.</description>
</property>
@@ -3040,6 +3035,15 @@
Property to determine the transport protocol for the client to Ozone
Manager channel.
</description>
</property>
+
+ <property>
+ <name>ozone.recon.address</name>
+ <value/>
+ <tag>RECON, MANAGEMENT</tag>
+ <description>
+ RPC address of Recon Server. If not set, datanodes will not configure
Recon Server.
+ </description>
+ </property>
<property>
<name>ozone.recon.http.enabled</name>
<value>true</value>
@@ -3950,6 +3954,16 @@
OM/SCM/DN/S3GATEWAY Server connection timeout in milliseconds.
</description>
</property>
+
+ <property>
+ <name>ozone.om.s3.grpc.server_enabled</name>
+ <value>true</value>
+ <tag>OZONE, OM, S3GATEWAY</tag>
+ <description>
+ Property to enable or disable Ozone Manager gRPC endpoint for clients.
Right now, it is used by S3 Gateway only.
+ </description>
+ </property>
+
<property>
<name>ozone.om.grpc.maximum.response.length</name>
<value>134217728</value>
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 45dc992980..01dae38157 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
@@ -91,7 +91,6 @@ private void addPropertiesNotInXml() {
ScmConfigKeys.OZONE_CHUNK_READ_NETTY_CHUNKED_NIO_FILE_KEY,
OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY,
OMConfigKeys.OZONE_FS_TRASH_CHECKPOINT_INTERVAL_KEY,
- OMConfigKeys.OZONE_OM_S3_GPRC_SERVER_ENABLED,
OMConfigKeys.OZONE_OM_FEATURES_DISABLED,
OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE,
@@ -101,7 +100,6 @@ private void addPropertiesNotInXml() {
OzoneConfigKeys.OZONE_RECOVERING_CONTAINER_TIMEOUT,
OzoneConfigKeys.OZONE_GPRC_METRICS_PERCENTILES_INTERVALS_KEY,
ReconConfigKeys.RECON_SCM_CONFIG_PREFIX,
- ReconConfigKeys.OZONE_RECON_ADDRESS_KEY,
ReconConfigKeys.OZONE_RECON_DATANODE_ADDRESS_KEY,
ReconConfigKeys.OZONE_RECON_DATANODE_BIND_HOST_KEY,
ReconConfigKeys.OZONE_RECON_PROMETHEUS_HTTP_ENDPOINT,
diff --git
a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
index fed26e6413..771d2b190c 100644
---
a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
+++
b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
@@ -24,7 +24,6 @@
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_DU_RESERVED;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
-import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_REST_HTTP_ADDRESS_KEY;
import static
org.apache.hadoop.ozone.HddsDatanodeService.TESTING_DATANODE_VERSION_CURRENT;
import static
org.apache.hadoop.ozone.HddsDatanodeService.TESTING_DATANODE_VERSION_INITIAL;
import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_CONTAINER_IPC_PORT;
@@ -124,7 +123,6 @@ public OzoneConfiguration apply(OzoneConfiguration conf)
throws IOException {
}
private void configureDatanodePorts(ConfigurationTarget conf) {
- conf.set(HDDS_REST_HTTP_ADDRESS_KEY, anyHostWithFreePort());
conf.set(HDDS_DATANODE_HTTP_ADDRESS_KEY, anyHostWithFreePort());
conf.set(HDDS_DATANODE_CLIENT_ADDRESS_KEY, anyHostWithFreePort());
conf.setInt(HDDS_CONTAINER_IPC_PORT, getFreePort());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
