Address comments and cleanup

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

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala b/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala
@@ -4635,17 +4635,15 @@ object CelebornConf extends Logging {
   val WORKER_INTERNAL_PORT: ConfigEntry[Int] =
     buildConf("celeborn.worker.internal.port")
       .categories("worker")
-      .doc(
-        "Internal server port on the Worker where the master nodes connect.")
+      .doc("Internal server port on the Worker where the master nodes connect.")
       .version("0.5.0")
       .intConf
       .createWithDefault(0)
 
   val WORKER_SECURED_RPC_PORT: ConfigEntry[Int] =
     buildConf("celeborn.worker.secured.rpc.port")
       .categories("worker", "auth")
-      .doc(
-        "Secured port on the Worker where the clients connect.")
+      .doc("Secured port on the Worker where the clients connect.")
       .version("0.5.0")
       .intConf
       .createWithDefault(0)

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
@@ -102,13 +102,13 @@ object ControlMessages extends Logging {
         .setPushPort(pushPort)
         .setFetchPort(fetchPort)
         .setReplicatePort(replicatePort)
-        .addAllDisks(pbDisks)
-        .putAllUserResourceConsumption(pbUserResourceConsumption)
-        .setRequestId(requestId)
         .setInternalPort(internalPort)
         .setSecuredRpcPort(securedRpcPort)
         .setSecuredPushPort(securedPushPort)
         .setSecuredFetchPort(securedFetchPort)
+        .addAllDisks(pbDisks)
+        .putAllUserResourceConsumption(pbUserResourceConsumption)
+        .setRequestId(requestId)
         .build()
     }
   }
@@ -329,11 +329,11 @@ object ControlMessages extends Logging {
       .setPushPort(pushPort)
       .setFetchPort(fetchPort)
       .setReplicatePort(replicatePort)
-      .setRequestId(requestId)
       .setInternalPort(internalPort)
       .setSecuredRpcPort(securedRpcPort)
       .setSecuredPushPort(securedPushPort)
       .setSecuredFetchPort(securedFetchPort)
+      .setRequestId(requestId)
       .build()
   }