loadAverage display problem bug fix (#1104)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources

* checkQueueNameExist method update

* checkQueueExist

* install.sh error output update

* signOut error update

* ProcessDao is null bug fix

* install.sh add mail.user

* request url variables replace

* process define import bug fix

* process define import export bug fix

* processdefine import export bug fix

* down log suffix format modify

* import export process define contains crontab error bug fix

* add Flink local mode

* ProcessDao is null bug fix

* loadAverage display problem bug fix

* MasterServer rename Server

* rollback .env

* rollback .env

* MasterServer rename Server

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

@@ -21,7 +21,7 @@ import org.apache.dolphinscheduler.api.utils.ZookeeperMonitor;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ZKNodeType;
 import org.apache.dolphinscheduler.dao.MonitorDBDao;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.entity.ZookeeperRecord;
@@ -65,7 +65,7 @@ public class MonitorService extends BaseService{
 
     Map<String, Object> result = new HashMap<>(5);
 
-    List<MasterServer> masterServers = getServerListFromZK(true);
+    List<Server> masterServers = getServerListFromZK(true);
     result.put(Constants.DATA_LIST, masterServers);
     putMsg(result,Status.SUCCESS);
 
@@ -99,16 +99,16 @@ public class MonitorService extends BaseService{
   public Map<String,Object> queryWorker(User loginUser) {
 
     Map<String, Object> result = new HashMap<>(5);
-    List<MasterServer> workerServers = getServerListFromZK(false);
+    List<Server> masterServers = getServerListFromZK(false);
 
-    result.put(Constants.DATA_LIST, workerServers);
+    result.put(Constants.DATA_LIST, masterServers);
     putMsg(result,Status.SUCCESS);
 
     return result;
   }
 
-  public List<MasterServer> getServerListFromZK(boolean isMaster){
+  public List<Server> getServerListFromZK(boolean isMaster){
-    List<MasterServer> servers = new ArrayList<>();
+    List<Server> servers = new ArrayList<>();
     ZookeeperMonitor zookeeperMonitor = null;
     try{
       zookeeperMonitor = new ZookeeperMonitor();

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

@@ -25,7 +25,7 @@ import org.apache.dolphinscheduler.common.enums.FailureStrategy;
 import org.apache.dolphinscheduler.common.enums.Priority;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;
 import org.apache.dolphinscheduler.common.enums.WarningType;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.ProcessDao;
@@ -334,7 +334,7 @@ public class SchedulerService extends BaseService {
         }
 
         // check master server exists
-        List<MasterServer> masterServers = monitorService.getServerListFromZK(true);
+        List<Server> masterServers = monitorService.getServerListFromZK(true);
 
 
         if (masterServers.size() == 0) {

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java

@@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.utils;
 
 import org.apache.dolphinscheduler.common.enums.ZKNodeType;
 import org.apache.dolphinscheduler.common.zk.AbstractZKClient;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.dao.entity.ZookeeperRecord;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -55,7 +55,7 @@ public class ZookeeperMonitor extends AbstractZKClient{
 	 * get master servers
 	 * @return
 	 */
-	public List<MasterServer> getMasterServers(){
+	public List<Server> getMasterServers(){
 	    return getServersList(ZKNodeType.MASTER);
 	}
 
@@ -63,7 +63,7 @@ public class ZookeeperMonitor extends AbstractZKClient{
 	 * master construct is the same with worker, use the master instead
 	 * @return
 	 */
-	public List<MasterServer> getWorkerServers(){
+	public List<Server> getWorkerServers(){
 	    return getServersList(ZKNodeType.WORKER);
 	}
 

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java

@@ -16,7 +16,7 @@
  */
 package org.apache.dolphinscheduler.api.utils;
 
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.junit.Assert;
 import org.junit.Test;
 import java.util.List;
@@ -33,9 +33,9 @@ public class ZookeeperMonitorUtilsTest {
         ZookeeperMonitor zookeeperMonitor = new ZookeeperMonitor();
 
 
-        List<MasterServer> masterServerList = zookeeperMonitor.getMasterServers();
+        List<Server> masterServerList = zookeeperMonitor.getMasterServers();
 
-        List<MasterServer> workerServerList = zookeeperMonitor.getWorkerServers();
+        List<Server> workerServerList = zookeeperMonitor.getWorkerServers();
 
         Assert.assertTrue(masterServerList.size() >= 0);
         Assert.assertTrue(workerServerList.size() >= 0);

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

@@ -587,7 +587,7 @@ public final class Constants {
     /**
      * heartbeat for zk info length
      */
-    public static final int HEARTBEAT_FOR_ZOOKEEPER_INFO_LENGTH = 6;
+    public static final int HEARTBEAT_FOR_ZOOKEEPER_INFO_LENGTH = 7;
 
 
     /**
@@ -696,6 +696,12 @@ public final class Constants {
     public static final String SPARK_QUEUE = "--queue";
 
 
+    /**
+     * --queue --qu
+     */
+    public static final String FLINK_QUEUE = "--qu";
+
+
     /**
      * exit code success
      */

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java

@@ -20,9 +20,9 @@ package org.apache.dolphinscheduler.common.model;
 import java.util.Date;
 
 /**
- * master server
+ * server
  */
-public class MasterServer {
+public class Server {
 
     /**
      * id

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ResInfo.java

@@ -17,7 +17,7 @@
 package org.apache.dolphinscheduler.common.utils;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 
 import java.util.Date;
 
@@ -49,8 +49,7 @@ public class ResInfo {
     }
 
     public ResInfo(double cpuUsage, double memoryUsage, double loadAverage) {
-        this.cpuUsage = cpuUsage;
+        this(cpuUsage,memoryUsage);
-        this.memoryUsage = memoryUsage;
         this.loadAverage = loadAverage;
     }
 
@@ -80,30 +79,25 @@ public class ResInfo {
 
     /**
      * get CPU and memory usage
-     * add cpu load average by lidong for service monitor
      * @return
      */
-    public static String getResInfoJson(){
+    public static String getResInfoJson(double cpuUsage , double memoryUsage,double loadAverage){
-        ResInfo resInfo = new ResInfo(OSUtils.cpuUsage(), OSUtils.memoryUsage(),OSUtils.loadAverage());
+        ResInfo resInfo = new ResInfo(cpuUsage,memoryUsage,loadAverage);
         return JSONUtils.toJson(resInfo);
     }
 
 
     /**
-     * get CPU and memory usage
+     * get heart beat info
+     * @param now
      * @return
      */
-    public static String getResInfoJson(double cpuUsage , double memoryUsage){
-        ResInfo resInfo = new ResInfo(cpuUsage,memoryUsage);
-        return JSONUtils.toJson(resInfo);
-    }
-
-
     public static String getHeartBeatInfo(Date now){
         return buildHeartbeatForZKInfo(OSUtils.getHost(),
                 OSUtils.getProcessID(),
                 OSUtils.cpuUsage(),
                 OSUtils.memoryUsage(),
+                OSUtils.loadAverage(),
                 DateUtils.dateToString(now),
                 DateUtils.dateToString(now));
 
@@ -115,17 +109,19 @@ public class ResInfo {
      * @param port
      * @param cpuUsage
      * @param memoryUsage
+     * @param loadAverage
      * @param createTime
      * @param lastHeartbeatTime
      * @return
      */
     public static String buildHeartbeatForZKInfo(String host , int port ,
-                                         double cpuUsage , double memoryUsage,
+                                         double cpuUsage , double memoryUsage,double loadAverage,
                                          String createTime,String lastHeartbeatTime){
 
         return host + Constants.COMMA + port + Constants.COMMA
                 + cpuUsage + Constants.COMMA
                 + memoryUsage + Constants.COMMA
+                + loadAverage + Constants.COMMA
                 + createTime + Constants.COMMA
                 + lastHeartbeatTime;
     }
@@ -135,19 +131,22 @@ public class ResInfo {
      * @param heartBeatInfo
      * @return
      */
-    public static MasterServer parseHeartbeatForZKInfo(String heartBeatInfo){
+    public static Server parseHeartbeatForZKInfo(String heartBeatInfo){
-        MasterServer masterServer =  null;
+        Server masterServer =  null;
         String[] masterArray = heartBeatInfo.split(Constants.COMMA);
-        if(masterArray.length != 6){
+        if(masterArray == null ||
+                masterArray.length != Constants.HEARTBEAT_FOR_ZOOKEEPER_INFO_LENGTH){
             return masterServer;
 
         }
-        masterServer = new MasterServer();
+        masterServer = new Server();
         masterServer.setHost(masterArray[0]);
         masterServer.setPort(Integer.parseInt(masterArray[1]));
-        masterServer.setResInfo(getResInfoJson(Double.parseDouble(masterArray[2]), Double.parseDouble(masterArray[3])));
+        masterServer.setResInfo(getResInfoJson(Double.parseDouble(masterArray[2]),
-        masterServer.setCreateTime(DateUtils.stringToDate(masterArray[4]));
+                Double.parseDouble(masterArray[3]),
-        masterServer.setLastHeartbeatTime(DateUtils.stringToDate(masterArray[5]));
+                Double.parseDouble(masterArray[4])));
+        masterServer.setCreateTime(DateUtils.stringToDate(masterArray[5]));
+        masterServer.setLastHeartbeatTime(DateUtils.stringToDate(masterArray[6]));
         return masterServer;
     }
 

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java

@@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.common.zk;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.IStoppable;
 import org.apache.dolphinscheduler.common.enums.ZKNodeType;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.OSUtils;
 import org.apache.dolphinscheduler.common.utils.ResInfo;
@@ -158,10 +158,12 @@ public abstract class AbstractZKClient {
 			if (splits.length != Constants.HEARTBEAT_FOR_ZOOKEEPER_INFO_LENGTH){
 				return;
 			}
-			String str = splits[0] + Constants.COMMA +splits[1] + Constants.COMMA
+			String str = splits[0] + Constants.COMMA
+					+ splits[1] + Constants.COMMA
 					+ OSUtils.cpuUsage() + Constants.COMMA
 					+ OSUtils.memoryUsage() + Constants.COMMA
-					+ splits[4] + Constants.COMMA
+					+ OSUtils.loadAverage() + Constants.COMMA
+					+ splits[5] + Constants.COMMA
 					+ DateUtils.dateToString(new Date());
 			zkClient.setData().forPath(znode,str.getBytes());
 
@@ -342,14 +344,14 @@ public abstract class AbstractZKClient {
 	 * @param zkNodeType
 	 * @return
 	 */
-	public List<MasterServer> getServersList(ZKNodeType zkNodeType){
+	public List<Server> getServersList(ZKNodeType zkNodeType){
 		Map<String, String> masterMap = getServerMaps(zkNodeType);
 		String parentPath = getZNodeParentPath(zkNodeType);
 
-		List<MasterServer> masterServers = new ArrayList<>();
+		List<Server> masterServers = new ArrayList<>();
 		int i = 0;
 		for (Map.Entry<String, String> entry : masterMap.entrySet()) {
-			MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
+			Server masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
 			masterServer.setZkDirectory( parentPath + "/"+ entry.getKey());
 			masterServer.setId(i);
 			i ++;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java

@@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ProgramType;
 import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,46 +33,58 @@ import java.util.List;
 public class FlinkArgsUtils {
 
     /**
-     *  build args
+     * build args
+     *
      * @param param
      * @return
      */
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(FlinkArgsUtils.class);
+
     public static List<String> buildArgs(FlinkParameters param) {
         List<String> args = new ArrayList<>();
+        String deployMode = "cluster";
+        if (StringUtils.isNotEmpty(param.getDeployMode())) {
+            deployMode = param.getDeployMode();
 
-        args.add(Constants.FLINK_RUN_MODE);  //-m
+        }
+        if (!"local".equals(deployMode)) {
+            args.add(Constants.FLINK_RUN_MODE);  //-m
 
-        args.add(Constants.FLINK_YARN_CLUSTER);   //yarn-cluster
+            args.add(Constants.FLINK_YARN_CLUSTER);   //yarn-cluster
 
-        if (param.getSlot() != 0) {
-            args.add(Constants.FLINK_YARN_SLOT);
-            args.add(String.format("%d", param.getSlot()));   //-ys
-        }
 
-        if (StringUtils.isNotEmpty(param.getAppName())) { //-ynm
+            if (param.getSlot() != 0) {
-            args.add(Constants.FLINK_APP_NAME);
+                args.add(Constants.FLINK_YARN_SLOT);
-            args.add(param.getAppName());
+                args.add(String.format("%d", param.getSlot()));   //-ys
-        }
+            }
 
-        if (param.getTaskManager() != 0) {                        //-yn
+            if (StringUtils.isNotEmpty(param.getAppName())) { //-ynm
-            args.add(Constants.FLINK_TASK_MANAGE);
+                args.add(Constants.FLINK_APP_NAME);
-            args.add(String.format("%d", param.getTaskManager()));
+                args.add(param.getAppName());
-        }
+            }
 
-        if (StringUtils.isNotEmpty(param.getJobManagerMemory())) {
+            if (param.getTaskManager() != 0) {                        //-yn
-            args.add(Constants.FLINK_JOB_MANAGE_MEM);
+                args.add(Constants.FLINK_TASK_MANAGE);
-            args.add(param.getJobManagerMemory()); //-yjm
+                args.add(String.format("%d", param.getTaskManager()));
-        }
+            }
 
-        if (StringUtils.isNotEmpty(param.getTaskManagerMemory())) { // -ytm
+            if (StringUtils.isNotEmpty(param.getJobManagerMemory())) {
-            args.add(Constants.FLINK_TASK_MANAGE_MEM);
+                args.add(Constants.FLINK_JOB_MANAGE_MEM);
-            args.add(param.getTaskManagerMemory());
+                args.add(param.getJobManagerMemory()); //-yjm
-        }
+            }
-        args.add(Constants.FLINK_detach); //-d
 
+            if (StringUtils.isNotEmpty(param.getTaskManagerMemory())) { // -ytm
+                args.add(Constants.FLINK_TASK_MANAGE_MEM);
+                args.add(param.getTaskManagerMemory());
+            }
+
+            args.add(Constants.FLINK_detach); //-d
+
+
+        }
 
-        if(param.getProgramType() !=null ){
+        if (param.getProgramType() != null) {
-            if(param.getProgramType()!=ProgramType.PYTHON){
+            if (param.getProgramType() != ProgramType.PYTHON) {
                 if (StringUtils.isNotEmpty(param.getMainClass())) {
                     args.add(Constants.FLINK_MAIN_CLASS);    //-c
                     args.add(param.getMainClass());          //main class
@@ -83,28 +96,29 @@ public class FlinkArgsUtils {
             args.add(param.getMainJar().getRes());
         }
 
+        if (StringUtils.isNotEmpty(param.getMainArgs())) {
+            args.add(param.getMainArgs());
+        }
 
         // --files --conf --libjar ...
-      if (StringUtils.isNotEmpty(param.getOthers())) {
+        if (StringUtils.isNotEmpty(param.getOthers())) {
             String others = param.getOthers();
-            if(!others.contains("--queue")){
+            if (!others.contains("--qu")) {
-                if (StringUtils.isNotEmpty(param.getQueue())) {
+                if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) {
-                    args.add(Constants.SPARK_QUEUE);
+                    args.add(Constants.FLINK_QUEUE);
                     args.add(param.getQueue());
                 }
             }
             args.add(param.getOthers());
-        }else if (StringUtils.isNotEmpty(param.getQueue())) {
+        } else if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) {
-            args.add(Constants.SPARK_QUEUE);
+            args.add(Constants.FLINK_QUEUE);
             args.add(param.getQueue());
 
         }
 
-       if (StringUtils.isNotEmpty(param.getMainArgs())) {
-            args.add(param.getMainArgs());
-        }
 
         return args;
     }
 
+
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java

@@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.server.zk;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.enums.ZKNodeType;
-import org.apache.dolphinscheduler.common.model.MasterServer;
+import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.common.zk.AbstractZKClient;
 import org.apache.dolphinscheduler.dao.AlertDao;
 import org.apache.dolphinscheduler.dao.DaoFactory;
@@ -141,7 +141,6 @@ public class ZKMasterClient extends AbstractZKClient {
 	 */
 	public void initDao(){
 		this.alertDao = DaoFactory.getDaoInstance(AlertDao.class);
-//		this.processDao = DaoFactory.getDaoInstance(ProcessDao.class);
 	}
 	/**
 	 * get alert dao
@@ -345,10 +344,10 @@ public class ZKMasterClient extends AbstractZKClient {
 	    	return false;
 		}
 	    Date workerServerStartDate = null;
-	    List<MasterServer> workerServers= getServersList(ZKNodeType.WORKER);
+	    List<Server> workerServers= getServersList(ZKNodeType.WORKER);
-	    for(MasterServer server : workerServers){
+	    for(Server workerServer : workerServers){
-	    	if(server.getHost().equals(taskInstance.getHost())){
+	    	if(workerServer.getHost().equals(taskInstance.getHost())){
-	    	    workerServerStartDate = server.getCreateTime();
+	    	    workerServerStartDate = workerServer.getCreateTime();
 	    	    break;
 			}
 		}

dolphinscheduler-ui/.env

@@ -1,5 +1,5 @@
 # 后端接口地址
-API_BASE = http://127.0.0.1:12345
+API_BASE = http://192.168.xx.xx:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx