Commit 41ce72bc authored by bao liang's avatar bao liang Committed by lgcareer
Browse files

fix Monitor bug (#1656) 

* fix Monitor bug

* fix zk monitor bug
parent ab7b7d4c

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java

+6 −14
Original line number Diff line number Diff line
@@ -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<Server> getServerListFromZK(boolean isMaster){

    List<Server> servers = new ArrayList<>();

    ZookeeperMonitor zookeeperMonitor = null;

    try{

      zookeeperMonitor = new ZookeeperMonitor();



    checkNotNull(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 zookeeperMonitor.getServersList(zkNodeType);

  }



}