diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java index 56237647c1..b363d69186 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java @@ -78,16 +78,16 @@ public abstract class AbstractZKClient { // retry strategy RetryPolicy retryPolicy = new ExponentialBackoffRetry( - Integer.parseInt(conf.getString(Constants.ZOOKEEPER_RETRY_SLEEP)), - Integer.parseInt(conf.getString(Constants.ZOOKEEPER_RETRY_MAXTIME))); + conf.getInt(Constants.ZOOKEEPER_RETRY_SLEEP), + conf.getInt(Constants.ZOOKEEPER_RETRY_MAXTIME)); try{ // crate zookeeper client zkClient = CuratorFrameworkFactory.builder() .connectString(getZookeeperQuorum()) .retryPolicy(retryPolicy) - .sessionTimeoutMs(1000 * Integer.parseInt(conf.getString(Constants.ZOOKEEPER_SESSION_TIMEOUT))) - .connectionTimeoutMs(1000 * Integer.parseInt(conf.getString(Constants.ZOOKEEPER_CONNECTION_TIMEOUT))) + .sessionTimeoutMs(1000 * conf.getInt(Constants.ZOOKEEPER_SESSION_TIMEOUT)) + .connectionTimeoutMs(1000 * conf.getInt(Constants.ZOOKEEPER_CONNECTION_TIMEOUT)) .build(); zkClient.start(); @@ -240,7 +240,6 @@ public abstract class AbstractZKClient { return registerPath; } registerPath = createZNodePath(zkNodeType); - logger.info("register {} node {} success", zkNodeType.toString(), registerPath); // handle dead server handleDeadServer(registerPath, zkNodeType, Constants.DELETE_ZK_OP); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java index b5bee4ab8a..ca78129ab3 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java @@ -162,11 +162,11 @@ public class AlertDao extends AbstractBaseDao { /** * list user information by alert group id - * @param alergroupId + * @param alertgroupId * @return */ - public List listUserByAlertgroupId(int alergroupId){ - return userAlertGroupMapper.listUserByAlertgroupId(alergroupId); + public List listUserByAlertgroupId(int alertgroupId){ + return userAlertGroupMapper.listUserByAlertgroupId(alertgroupId); } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java index c6fa46307d..531caef6ca 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java @@ -1686,18 +1686,18 @@ public class ProcessDao extends AbstractBaseDao { */ public int getTaskWorkerGroupId(TaskInstance taskInstance) { int taskWorkerGroupId = taskInstance.getWorkerGroupId(); - int processInstanceId = taskInstance.getProcessInstanceId(); + if(taskWorkerGroupId > 0){ + return taskWorkerGroupId; + } + int processInstanceId = taskInstance.getProcessInstanceId(); ProcessInstance processInstance = findProcessInstanceById(processInstanceId); - if(processInstance == null){ - logger.error("cannot find the task:{} process instance", taskInstance.getId()); - return Constants.DEFAULT_WORKER_ID; + if(processInstance != null){ + return processInstance.getWorkerGroupId(); } - int processWorkerGroupId = processInstance.getWorkerGroupId(); - - taskWorkerGroupId = (taskWorkerGroupId <= 0 ? processWorkerGroupId : taskWorkerGroupId); - return taskWorkerGroupId; + logger.info("task : {} will use default worker group id", taskInstance.getId()); + return Constants.DEFAULT_WORKER_ID; } public List getProjectListHavePerm(int userId){ diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 8ee8b019e4..4cf6222ae9 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -485,7 +485,6 @@ export default { 'taskManager':'taskManage数量', 'jobManagerMemory':'jobManager内存数', 'taskManagerMemory':'taskManager内存数', - 'Complement range': '补数范围', 'Http Url':'请求地址', 'Http Method':'请求类型', 'Http Parameters':'请求参数',