Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException #3787

Merged
merged 20 commits into from
Sep 22, 2020
Merged

[Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException #3787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0fef52c
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 14, 2020
669419b
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 14, 2020
8aba5aa
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 15, 2020
df1d609
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 15, 2020
2383b92
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 15, 2020
02bd10d
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 15, 2020
d5fbb9d
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 15, 2020
177cf0f
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 16, 2020
8231036
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 16, 2020
f2b9e25
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 16, 2020
68e8320
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
Sep 21, 2020
81283ff
[Fix-3616][Server] when worker akc/response master exception , async …
Sep 21, 2020
1266cdf
The batch delete function in the workflow definition and workflow ins…
Sep 9, 2020
a7e45a0
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
Sep 21, 2020
6c28253
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does no…
brave-lee Aug 19, 2020
2d1ffa5
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does no…
Sep 21, 2020
7419919
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
Sep 22, 2020
387481c
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does no…
Sep 22, 2020
ad4a587
Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.…
Sep 22, 2020
d2e1419
[BugFixed] issue #3258 (#3265)
brave-lee Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...heduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -149,8 +146,8 @@ private List<WorkerGroup> getWorkerGroups(boolean isPaging) {
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);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void init(){

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");
}

/**
Expand Down Expand Up @@ -115,4 +115,4 @@ private List<ProcessInstance> getProcessInstanceList(){
return processInstances;
}

}
}