From 4d0d80bba5a7a9739400ed85454e4011523ad701 Mon Sep 17 00:00:00 2001 From: Angerszhuuuu Date: Tue, 25 Jul 2023 14:35:13 +0800 Subject: [PATCH] Update Worker.scala --- .../celeborn/service/deploy/worker/Worker.scala | 13 ++++++++----- 1 file changed, 8 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 f77686fb524..19706a397c6 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 @@ -439,7 +439,6 @@ private[celeborn] class Worker( logInfo("Worker is stopped.") stopped = true } - shutdown.set(true) } private def registerWithMaster(): Unit = { @@ -623,11 +622,15 @@ private[celeborn] class Worker( ShutdownHookManager.get().addShutdownHook( new Thread(new Runnable { override def run(): Unit = { - logInfo("Shutdown hook called.") - if (exitKind == CelebornExitKind.WORKER_GRACEFUL_SHUTDOWN) { - shutdownGracefully() + if (stopped) { + logInfo("Worker already stopped before call ShutdownHook.") } else { - exitImmediately() + logInfo("Shutdown hook called.") + if (exitKind == CelebornExitKind.WORKER_GRACEFUL_SHUTDOWN) { + shutdownGracefully() + } else { + exitImmediately() + } } } }),