diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java index 91e58ef6cc..118c5ce936 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java @@ -33,6 +33,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.apache.dolphinscheduler.common.utils.Preconditions.*; + /** * monitor service */ @@ -116,20 +118,10 @@ public class MonitorService extends BaseService{ } public List getServerListFromZK(boolean isMaster){ - List servers = new ArrayList<>(); - ZookeeperMonitor zookeeperMonitor = null; - try{ - zookeeperMonitor = new ZookeeperMonitor(); - ZKNodeType zkNodeType = isMaster ? ZKNodeType.MASTER : ZKNodeType.WORKER; - servers = zookeeperMonitor.getServersList(zkNodeType); - }catch (Exception e){ - throw e; - }finally { - if(zookeeperMonitor != null){ - zookeeperMonitor.close(); - } - } - return servers; + + checkNotNull(zookeeperMonitor); + ZKNodeType zkNodeType = isMaster ? ZKNodeType.MASTER : ZKNodeType.WORKER; + return zookeeperMonitor.getServersList(zkNodeType); } }