[incubator-celeborn] branch main updated: [CELEBORN-981] Imrpove enable graceful shutdown tips

[zhouky]

This is an automated email from the ASF dual-hosted git repository.

zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/main by this push:
     new 7b4d38ea1 [CELEBORN-981] Imrpove enable graceful shutdown tips
7b4d38ea1 is described below

commit 7b4d38ea14432c3399571d85959d59f2fdd27d52
Author: sychen <syc...@ctrip.com>
AuthorDate: Fri Sep 15 22:33:14 2023 +0800

    [CELEBORN-981] Imrpove enable graceful shutdown tips
    
    ### What changes were proposed in this pull request?
    
    ```
    celeborn.worker.graceful.shutdown.enabled=true
    ```
    
    ```
      23/09/15 17:17:29,887 ERROR [main] Worker: Initialize worker failed.
      java.lang.AssertionError: assertion failed: If enable graceful shutdown, 
the worker should use stable server port.
            at scala.Predef$.assert(Predef.scala:223)
            at 
org.apache.celeborn.service.deploy.worker.Worker.<init>(Worker.scala:87)
            at 
org.apache.celeborn.service.deploy.worker.Worker$.main(Worker.scala:734)
            at 
org.apache.celeborn.service.deploy.worker.Worker.main(Worker.scala)
    ```
    
    ```
    23/09/15 17:51:25,937 ERROR [main] Worker: Initialize worker failed.
      java.lang.AssertionError: assertion failed: If enable graceful shutdown, 
the worker should use non-zero port. celeborn.worker.rpc.port=0, 
celeborn.worker.fetch.port=9193, celeborn.worker.push.port=9192, 
celeborn.worker.replicate.port=9194
            at scala.Predef$.assert(Predef.scala:223)
            at 
org.apache.celeborn.service.deploy.worker.Worker.<init>(Worker.scala:91)
            at 
org.apache.celeborn.service.deploy.worker.Worker$.main(Worker.scala:738)
            at 
org.apache.celeborn.service.deploy.worker.Worker.main(Worker.scala)
    ```
    
    ### Why are the changes needed?
    
    ### Does this PR introduce _any_ user-facing change?
    
    ### How was this patch tested?
    
    Closes #1917 from cxzl25/CELEBORN-981.
    
    Authored-by: sychen <syc...@ctrip.com>
    Signed-off-by: zky.zhoukeyong <zky.zhoukey...@alibaba-inc.com>
---
 .../org/apache/celeborn/service/deploy/worker/Worker.scala | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala 
b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
index 77f0cd3ac..c791d1d06 100644
--- 
a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
+++ 
b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
@@ -80,12 +80,16 @@ private[celeborn] class Worker(
   val shutdown = new AtomicBoolean(false)
   private val gracefulShutdown = conf.workerGracefulShutdown
   private var exitKind = CelebornExitKind.EXIT_IMMEDIATELY
-  assert(
-    !gracefulShutdown || (gracefulShutdown &&
-      conf.workerRpcPort > 0 && conf.workerFetchPort > 0 &&
-      conf.workerPushPort > 0 && conf.workerReplicatePort > 0),
-    "If enable graceful shutdown, the worker should use stable server port.")
   if (gracefulShutdown) {
+    val checkPortMap = Map(
+      WORKER_RPC_PORT -> conf.workerRpcPort,
+      WORKER_FETCH_PORT -> conf.workerFetchPort,
+      WORKER_PUSH_PORT -> conf.workerPushPort,
+      WORKER_REPLICATE_PORT -> conf.workerReplicatePort)
+    assert(
+      !checkPortMap.values.exists(_ == 0),
+      "If enable graceful shutdown, the worker should use non-zero port. " +
+        s"${checkPortMap.map { case (k, v) => k.key + "=" + v }.mkString(", 
")}")
     exitKind = CelebornExitKind.WORKER_GRACEFUL_SHUTDOWN
     try {
       val recoverRoot = new File(conf.workerGracefulShutdownRecoverPath)