Skip to content

HDDS-12761. Add missing network configuration properties in ozone-default.xml #8257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jojochuang merged 3 commits into from
Apr 10, 2025
Merged

HDDS-12761. Add missing network configuration properties in ozone-default.xml #8257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0036645
HDDS-12761. Add missing network port configuration properties into oz…
jojochuang Apr 3, 2025
d2da8a0
Remove default recon server value
jojochuang Apr 9, 2025
1e6d5d6
Fix tests
jojochuang Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,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";
Expand Down
34 changes: 24 additions & 10 deletions hadoop-hdds/common/src/main/resources/ozone-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,12 +1527,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/>
Expand Down Expand Up @@ -1853,10 +1847,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>
Expand All @@ -1878,7 +1873,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>
Expand Down Expand Up @@ -3049,6 +3044,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>
Expand Down Expand Up @@ -3959,6 +3963,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>
Expand Down
2 changes: 0 additions & 2 deletions .../integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/UniformDatanodesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down