address review comments

apache · Feb 13, 2024 · 1abebb9 · 1abebb9
1 parent f55fce1
commit 1abebb9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala b/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala
@@ -148,14 +148,12 @@ class WorkerInfo(
   }
 
   def readableAddress(authEnabled: Boolean): String = {
+    var addressStr = s"Host:$host:RpcPort:$rpcPort:PushPort:$pushPort:" +
+      s"FetchPort:$fetchPort:ReplicatePort:$replicatePort:InternalPort:$internalPort"
     if (authEnabled) {
-      s"Host:$host:RpcPort:$rpcPort:PushPort:$pushPort:" +
-        s"FetchPort:$fetchPort:ReplicatePort:$replicatePort:InternalPort:$internalPort" +
-        s":SecuredRpcPort:$securedRpcPort:SecuredPushPort:$securedPushPort:SecuredFetchPort:$securedFetchPort"
-    } else {
-      s"Host:$host:RpcPort:$rpcPort:PushPort:$pushPort:" +
-        s"FetchPort:$fetchPort:ReplicatePort:$replicatePort:InternalPort:$internalPort"
+      addressStr += s":SecuredRpcPort:$securedRpcPort:SecuredPushPort:$securedPushPort:SecuredFetchPort:$securedFetchPort"
     }
+    addressStr
   }
 
   def toUniqueId(): String = {

diff --git a/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala b/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala
@@ -567,13 +567,15 @@ object ControlMessages extends Logging {
         .addAllDisks(pbDisks)
         .putAllUserResourceConsumption(pbUserResourceConsumption)
         .setReplicatePort(replicatePort)
+        .setInternalPort(internalPort)
+        .setSecuredRpcPort(securedRpcPort)
+        .setSecuredPushPort(securedPushPort)
+        .setSecuredFetchPort(securedFetchPort)
         .addAllActiveShuffleKeys(activeShuffleKeys)
         .putAllEstimatedAppDiskUsage(estimatedAppDiskUsage)
         .setHighWorkload(highWorkload)
         .setWorkerStatus(PbSerDeUtils.toPbWorkerStatus(workerStatus))
         .setRequestId(requestId)
-        .setInternalPort(internalPort)
-        .setSecuredRpcPort(securedRpcPort)
         .build().toByteArray
       new TransportMessage(MessageType.HEARTBEAT_FROM_WORKER, payload)