From 802796621e285021040c185e519522073da698d4 Mon Sep 17 00:00:00 2001 From: oceanos Date: Wed, 22 Apr 2020 15:11:48 +0800 Subject: [PATCH 1/4] reset default zookeeper parameter --- .../DOLPHIN/1.2.1/configuration/dolphin-common.xml | 4 ++-- dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl | 6 +++--- .../src/main/resources/zookeeper.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml b/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml index 41e2836e37..7d4fb8329b 100644 --- a/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml +++ b/ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-common.xml @@ -43,7 +43,7 @@ zookeeper.connection.timeout - 300 + 30000 int @@ -73,7 +73,7 @@ zookeeper.retry.maxtime - 5 + 10 int diff --git a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl b/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl index a0ef72dc8f..362a4e85ad 100644 --- a/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl +++ b/dockerfile/conf/dolphinscheduler/zookeeper.properties.tpl @@ -22,8 +22,8 @@ zookeeper.quorum=${ZOOKEEPER_QUORUM} #zookeeper.dolphinscheduler.root=/dolphinscheduler # dolphinscheduler failover directory -#zookeeper.session.timeout=300 -#zookeeper.connection.timeout=300 +#zookeeper.session.timeout=60000 +#zookeeper.connection.timeout=30000 #zookeeper.retry.base.sleep=100 #zookeeper.retry.max.sleep=30000 -#zookeeper.retry.maxtime=5 \ No newline at end of file +#zookeeper.retry.maxtime=10 \ No newline at end of file diff --git a/dolphinscheduler-service/src/main/resources/zookeeper.properties b/dolphinscheduler-service/src/main/resources/zookeeper.properties index a0df570d47..2204467ac9 100644 --- a/dolphinscheduler-service/src/main/resources/zookeeper.properties +++ b/dolphinscheduler-service/src/main/resources/zookeeper.properties @@ -23,7 +23,7 @@ zookeeper.quorum=localhost:2181 # dolphinscheduler failover directory #zookeeper.session.timeout=60000 -#zookeeper.connection.timeout=300 +#zookeeper.connection.timeout=30000 #zookeeper.retry.base.sleep=100 #zookeeper.retry.max.sleep=30000 -#zookeeper.retry.maxtime=5 \ No newline at end of file +#zookeeper.retry.maxtime=10 \ No newline at end of file From 0bbdbf69f89e90e9e6e2e51c5aa4172b90897c21 Mon Sep 17 00:00:00 2001 From: oceanos Date: Wed, 22 Apr 2020 17:49:39 +0800 Subject: [PATCH 2/4] fix install.sh zookeeper.properties --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 20b293f697..9aa61d8e14 100644 --- a/install.sh +++ b/install.sh @@ -52,7 +52,7 @@ sed -i ${txt} "s#hadoop.security.authentication.startup.state.*#hadoop.security. sed -i ${txt} "s#java.security.krb5.conf.path.*#java.security.krb5.conf.path=${krb5ConfPath}#g" conf/common.properties sed -i ${txt} "s#login.user.keytab.username.*#login.user.keytab.username=${keytabUserName}#g" conf/common.properties sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g" conf/common.properties -sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/common.properties +sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/zookeeper.properties sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties From d4d31088bd746642ea61b6d8a698744eebd94681 Mon Sep 17 00:00:00 2001 From: oceanos Date: Thu, 23 Apr 2020 15:47:51 +0800 Subject: [PATCH 3/4] fix ui i18n issue --- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 +- dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index db19e1fc0e..0e83689149 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -115,6 +115,7 @@ export default { 'Title': 'Title', 'Please enter the title of email': 'Please enter the title of email', 'Table': 'Table', + 'TableMode': 'Table', 'Attachment': 'Attachment', 'SQL Parameter': 'SQL Parameter', 'SQL Statement': 'SQL Statement', @@ -538,7 +539,6 @@ export default { 'Whether directory': 'Whether directory', 'Yes': 'Yes', 'No': 'No', - 'Modify User': 'Modify User', 'Please enter Mysql Database(required)': 'Please enter Mysql Database(required)', 'Please enter Mysql Table(required)': 'Please enter Mysql Table(required)', 'Please enter Columns (Comma separated)': 'Please enter Columns (Comma separated)', 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 80b45c7a11..134ca84a58 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -116,6 +116,7 @@ export default { 'Title': '主题', 'Please enter the title of email': '请输入邮件主题', 'Table': '表名', + 'TableMode': '表格', 'Attachment': '附件', 'SQL Parameter': 'sql参数', 'SQL Statement': 'sql语句', @@ -538,7 +539,6 @@ export default { 'Whether directory' : '是否文件夹', 'Yes': '是', 'No': '否', - 'Modify User': '修改用户', 'Please enter Mysql Database(required)': '请输入Mysql数据库(必填)', 'Please enter Mysql Table(required)': '请输入Mysql表名(必填)', 'Please enter Columns (Comma separated)': '请输入列名，用 , 隔开', From e4dad2ac3f33a415069a3fa19b1c8ad16dbc2bb8 Mon Sep 17 00:00:00 2001 From: oceanos Date: Thu, 23 Apr 2020 16:36:55 +0800 Subject: [PATCH 4/4] fix showType in sql.vue --- .../src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 843c1eaf1f..9e7f3305e5 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -37,7 +37,7 @@
- {{$t('Table')}} + {{$t('TableMode')}} {{$t('Attachment')}}