From d83661db25a1d5f23607583aa182d3c270046303 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 29 Oct 2021 17:44:06 +0800 Subject: [PATCH] [DS-6616][WorkerServer] fix worker stop fail and fakes death (#6621) * [DS-6616][WorkerServer] fix worker stop fail and fakes death * remove unuse test * just add try catch to remove zk worker path Co-authored-by: caishunfeng <534328519@qq.com> --- .../worker/registry/WorkerRegistryClient.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java index e8c6ad012c..b59e3ec616 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java @@ -122,15 +122,22 @@ public class WorkerRegistryClient { * remove registry info */ public void unRegistry() { - String address = getLocalAddress(); - Set workerZkPaths = getWorkerZkPaths(); - for (String workerZkPath : workerZkPaths) { - registryClient.remove(workerZkPath); - logger.info("worker node : {} unRegistry from ZK {}.", address, workerZkPath); + try { + String address = getLocalAddress(); + Set workerZkPaths = getWorkerZkPaths(); + for (String workerZkPath : workerZkPaths) { + registryClient.remove(workerZkPath); + logger.info("worker node : {} unRegistry from ZK {}.", address, workerZkPath); + } + } catch (Exception ex) { + logger.error("remove worker zk path exception", ex); } + this.heartBeatExecutor.shutdownNow(); logger.info("heartbeat executor shutdown"); + registryClient.close(); + logger.info("registry client closed"); } /**