Browse Source

fix Monitor bug

pull/2/head
loushang 5 years ago
parent
commit
dc4e46db41
  1. 17
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java

17
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,9 @@ public class MonitorService extends BaseService{
}
public List<Server> getServerListFromZK(boolean isMaster){
List<Server> 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;
return checkNotNull(zookeeperMonitor).getServersList(zkNodeType);
}
}

Loading…
Cancel
Save