This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new a24bb8b [1.3.6-prepare][Improvement][Server&UI] Update worker group
ip ad unify form model #4982 (#5016)
a24bb8b is described below
commit a24bb8b56c972b047b20dce55b483063594a50d0
Author: Shiwen Cheng <[email protected]>
AuthorDate: Fri Mar 12 16:46:14 2021 +0800
[1.3.6-prepare][Improvement][Server&UI] Update worker group ip ad unify
form model #4982 (#5016)
---
.../api/service/WorkerGroupService.java | 21 +++++++++++++--------
.../dag/_source/formModel/tasks/conditions.vue | 10 +++++-----
.../pages/dag/_source/formModel/tasks/dependent.vue | 10 +++++-----
.../home/pages/dag/_source/formModel/tasks/mr.vue | 4 ++--
.../pages/dag/_source/formModel/tasks/procedure.vue | 3 ---
.../pages/dag/_source/formModel/tasks/python.vue | 2 +-
.../pages/dag/_source/formModel/tasks/sqoop.vue | 5 ++---
7 files changed, 28 insertions(+), 27 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 374fd6e..26542b2 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
@@ -25,13 +25,19 @@ import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
+import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
/**
* work group service
*/
@@ -133,7 +139,6 @@ public class WorkerGroupService extends BaseService {
// available workerGroup list
List<String> availableWorkerGroupList = new ArrayList<>();
-
List<WorkerGroup> workerGroups = new ArrayList<>();
for (String workerGroup : workerGroupList){
@@ -144,10 +149,10 @@ public class WorkerGroupService extends BaseService {
WorkerGroup wg = new WorkerGroup();
wg.setName(workerGroup);
if (isPaging){
- wg.setIpList(childrenNodes);
- String registeredIpValue =
zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
-
wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));
-
wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));
+ wg.setIpList(childrenNodes.stream().map(node ->
Host.of(node).getIp()).collect(Collectors.toList()));
+ String registeredValue =
zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
+
wg.setCreateTime(DateUtils.stringToDate(registeredValue.split(",")[6]));
+
wg.setUpdateTime(DateUtils.stringToDate(registeredValue.split(",")[7]));
}
workerGroups.add(wg);
}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
index 621de81..8cf7144 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
@@ -15,7 +15,7 @@
* limitations under the License.
*/
<template>
- <div class="dependence-model">
+ <div class="conditions-model">
<m-list-box>
<div slot="text">{{$t('Custom Parameters')}}</div>
<div slot="content">
@@ -68,7 +68,7 @@
import mNodeStatus from './_source/nodeStatus'
import disabledState from '@/module/mixin/disabledState'
export default {
- name: 'dependence',
+ name: 'conditions',
data () {
return {
relation: 'AND',
@@ -134,7 +134,7 @@
this.isLoading = false
}, 600)
},
- cacheDependence (val) {
+ cacheDependent (val) {
this.$emit('on-cache-dependent', val)
}
},
@@ -164,7 +164,7 @@
destroyed () {
},
computed: {
- cacheDependence () {
+ cacheDependent () {
return {
relation: this.relation,
dependTaskList: _.map(this.dependTaskList, v => {
@@ -181,7 +181,7 @@
</script>
<style lang="scss" rel="stylesheet/scss">
- .dependence-model {
+ .conditions-model {
margin-top: -10px;
.dep-opt {
margin-bottom: 10px;
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 79d127a..6021284 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -15,7 +15,7 @@
* limitations under the License.
*/
<template>
- <div class="dependence-model">
+ <div class="dependent-model">
<m-list-box>
<div slot="text">{{$t('Add dependency')}}</div>
<div slot="content">
@@ -67,7 +67,7 @@
import disabledState from '@/module/mixin/disabledState'
export default {
- name: 'dependence',
+ name: 'dependent',
data () {
return {
relation: 'AND',
@@ -132,7 +132,7 @@
this.isLoading = false
}, 600)
},
- cacheDependence (val) {
+ cacheDependent (val) {
this.$emit('on-cache-dependent', val)
}
},
@@ -155,7 +155,7 @@
destroyed () {
},
computed: {
- cacheDependence () {
+ cacheDependent () {
return {
relation: this.relation,
dependTaskList: _.map(this.dependTaskList, v => {
@@ -172,7 +172,7 @@
</script>
<style lang="scss" rel="stylesheet/scss">
- .dependence-model {
+ .dependent-model {
margin-top: -10px;
.dep-opt {
margin-bottom: 10px;
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index b0832b7..bd08d60 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -15,7 +15,7 @@
* limitations under the License.
*/
<template>
- <div class="spark-model">
+ <div class="mr-model">
<m-list-box>
<div slot="text">{{$t('Program Type')}}</div>
<div slot="content">
@@ -444,7 +444,7 @@
</script>
<style lang="scss" rel="stylesheet/scss">
- .spark-model {
+ .mr-model {
.list-box-4p {
.list {
margin-bottom: 14px;
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
index e84f37d..2772e46 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
@@ -162,6 +162,3 @@
components: { mListBox, mDatasource, mLocalParams }
}
</script>
-
-<style lang="scss" rel="stylesheet/scss">
-</style>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
index 379de6a..78d5469 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
@@ -15,7 +15,7 @@
* limitations under the License.
*/
<template>
- <div class="shell-model">
+ <div class="python-model">
<m-list-box>
<div slot="text">{{$t('Script')}}</div>
<div slot="content">
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
index 1d9a14f..6503ad4 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
@@ -15,8 +15,7 @@
* limitations under the License.
*/
<template>
- <div class="sql-model">
-
+ <div class="sqoop-model">
<m-list-box>
<div slot="text">{{$t('Custom Job')}}</div>
<div slot="content">
@@ -574,7 +573,7 @@
let shellEditor
export default {
- name: 'sql',
+ name: 'sqoop',
data () {
return {
/**
