This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch 1.3.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.3-release by this push:
new dce518c [Fix-3258][Security][Worker group manage] Connot get create
time and update time,report DateTimeParseException (#3787)
dce518c is described below
commit dce518c3465d5cd9f6913aa0fc459bc05dadd78d
Author: qiaozhanwei <qiaozhan...@outlook.com>
AuthorDate: Tue Sep 22 17:38:45 2020 +0800
[Fix-3258][Security][Worker group manage] Connot get create time and update
time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow
instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidon...@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhan...@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhan...@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangcho...@163.com>
Co-authored-by: JinyLeeChina
<42576980+jinyleech...@users.noreply.github.com>
Co-authored-by: dailidong <dailidon...@gmail.com>
---
.../apache/dolphinscheduler/api/service/WorkerGroupService.java | 7 ++-----
.../dolphinscheduler/api/service/WorkerGroupServiceTest.java | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
index ce0ceeb..374fd6e 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
@@ -16,15 +16,12 @@
*/
package org.apache.dolphinscheduler.api.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.apache.dolphinscheduler.dao.entity.AccessToken;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
@@ -149,8 +146,8 @@ public class WorkerGroupService extends BaseService {
if (isPaging){
wg.setIpList(childrenNodes);
String registeredIpValue =
zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
-
wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[3]));
-
wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[4]));
+
wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));
+
wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));
}
workerGroups.add(wg);
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
index 6f7c8dd..d3c60cc 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
@@ -79,7 +79,7 @@ public class WorkerGroupServiceTest {
Mockito.when(zookeeperCachedOperator.getChildrenKeys(workerPath +
"/default")).thenReturn(defaultIpList);
- Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/"
+ defaultIpList.get(0))).thenReturn("0.02,0.23,0.03,2020-05-08
11:24:14,2020-05-08 14:22:24");
+ Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/"
+ defaultIpList.get(0))).thenReturn("0.01,0.17,0.03,25.83,8.0,1.0,2020-07-21
11:17:59,2020-07-21 14:39:20,0,13238");
}
/**
@@ -115,4 +115,4 @@ public class WorkerGroupServiceTest {
return processInstances;
}
-}
\ No newline at end of file
+}
