This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 de16b27e42b HDDS-13558. Convert dataStreamPort to local variable in
XceiverServerRatis (#9601)
de16b27e42b is described below
commit de16b27e42b15477fd254e979a5f72fc24e0c9fb
Author: Russole <[email protected]>
AuthorDate: Thu Jan 8 03:07:51 2026 +0800
HDDS-13558. Convert dataStreamPort to local variable in XceiverServerRatis
(#9601)
---
.../transport/server/ratis/XceiverServerRatis.java | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
index 0a242546d2a..6eadec2d6d3 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
@@ -130,9 +130,6 @@ public final class XceiverServerRatis implements
XceiverServerSpi {
private int adminPort;
private int clientPort;
- // TODO: https://issues.apache.org/jira/browse/HDDS-13558
- @SuppressWarnings("PMD.SingularField")
- private int dataStreamPort;
private final RaftServer server;
private final String name;
private final List<ThreadPoolExecutor> chunkExecutors;
@@ -247,18 +244,19 @@ private ContainerStateMachine getStateMachine(RaftGroupId
gid) {
private void setUpRatisStream(RaftProperties properties) {
// set the datastream config
+ final int requestedPort;
if (conf.getBoolean(
OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_RANDOM_PORT,
OzoneConfigKeys.
HDDS_CONTAINER_RATIS_DATASTREAM_RANDOM_PORT_DEFAULT)) {
- dataStreamPort = 0;
+ requestedPort = 0;
} else {
- dataStreamPort = conf.getInt(
+ requestedPort = conf.getInt(
OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_PORT,
OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_PORT_DEFAULT);
}
RatisHelper.enableNettyStreaming(properties);
- NettyConfigKeys.DataStream.setPort(properties, dataStreamPort);
+ NettyConfigKeys.DataStream.setPort(properties, requestedPort);
int dataStreamAsyncRequestThreadPoolSize =
ratisServerConfig.getStreamRequestThreads();
RaftServerConfigKeys.DataStream.setAsyncRequestThreadPoolSize(properties,
@@ -563,23 +561,23 @@ public void start() throws IOException {
server.start();
RaftServerRpc serverRpc = server.getServerRpc();
- clientPort = getRealPort(serverRpc.getClientServerAddress(),
+ clientPort = updateDatanodePort(serverRpc.getClientServerAddress(),
Port.Name.RATIS);
- adminPort = getRealPort(serverRpc.getAdminServerAddress(),
+ adminPort = updateDatanodePort(serverRpc.getAdminServerAddress(),
Port.Name.RATIS_ADMIN);
- serverPort = getRealPort(serverRpc.getInetSocketAddress(),
+ serverPort = updateDatanodePort(serverRpc.getInetSocketAddress(),
Port.Name.RATIS_SERVER);
if (streamEnable) {
DataStreamServerRpc dataStreamServerRpc =
server.getDataStreamServerRpc();
- dataStreamPort =
getRealPort(dataStreamServerRpc.getInetSocketAddress(),
+ updateDatanodePort(dataStreamServerRpc.getInetSocketAddress(),
Port.Name.RATIS_DATASTREAM);
}
isStarted = true;
}
}
- private int getRealPort(InetSocketAddress address, Port.Name portName) {
+ private int updateDatanodePort(InetSocketAddress address, Port.Name
portName) {
int realPort = address.getPort();
final Port port = DatanodeDetails.newPort(portName, realPort);
datanodeDetails.setPort(port);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
