You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/06/24 07:27:10 UTC
[dolphinscheduler] branch 3.0.0-beta-2-prepare updated (742944c60d -> c27fa1ab0d)
This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a change to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from 742944c60d [Fix] [Worker] Fix worker will hang if fails to start (#10501)
new ca566900b8 [FIX] Could not find or load main class org.apache.zookeeper.ZooKeeperMain (#10535)
new 3ba911d5d7 [fix] Change K8s postgresql password key name (#10545)
new c27fa1ab0d [feat] ui build no inherit from maven proxy (#10590)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl | 2 +-
dolphinscheduler-ui/pom.xml | 3 +++
script/remove-zk-node.sh | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
[dolphinscheduler] 02/03: [fix] Change K8s postgresql password key name (#10545)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a commit to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 3ba911d5d79aed7acb196c68b0b2880e52893917
Author: 旺阳 <qi...@cisco.com>
AuthorDate: Thu Jun 23 11:37:56 2022 +0800
[fix] Change K8s postgresql password key name (#10545)
(cherry picked from commit 388b214aca81d8d6873753f53f290b5b55d8ef58)
---
deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
index 8507f4669c..3d06502ad1 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -143,7 +143,7 @@ Create a database environment variables.
secretKeyRef:
{{- if .Values.postgresql.enabled }}
name: {{ template "dolphinscheduler.postgresql.fullname" . }}
- key: postgresql-password
+ key: postgres-password
{{- else }}
name: {{ include "dolphinscheduler.fullname" . }}-externaldb
key: database-password
[dolphinscheduler] 01/03: [FIX] Could not find or load main class org.apache.zookeeper.ZooKeeperMain (#10535)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a commit to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit ca566900b8063f032d04318e63f82750f2e877ef
Author: Desperado2 <Ja...@163.com>
AuthorDate: Tue Jun 21 17:26:52 2022 +0800
[FIX] Could not find or load main class org.apache.zookeeper.ZooKeeperMain (#10535)
* Update remove-zk-node.sh
* Update remove-zk-node.sh
* Update remove-zk-node.sh
* Update remove-zk-node.sh
(cherry picked from commit 4a3dfae0064856f7227430b586eb338c04486eb5)
---
script/remove-zk-node.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/script/remove-zk-node.sh b/script/remove-zk-node.sh
index c16f529af6..499d67e8c5 100755
--- a/script/remove-zk-node.sh
+++ b/script/remove-zk-node.sh
@@ -37,14 +37,14 @@ source ${BIN_DIR}/env/dolphinscheduler_env.sh
export JAVA_HOME=$JAVA_HOME
export DOLPHINSCHEDULER_CONF_DIR=$DOLPHINSCHEDULER_HOME/conf
-export DOLPHINSCHEDULER_LIB_JARS=$DOLPHINSCHEDULER_HOME/lib/*
+export DOLPHINSCHEDULER_LIB_JARS=$DOLPHINSCHEDULER_HOME/api-server/libs/*
export DOLPHINSCHEDULER_OPTS="-Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
export STOP_TIMEOUT=5
CLASS=org.apache.zookeeper.ZooKeeperMain
-exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS -server $registryServers rmr $rootNode"
+exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS -server $REGISTRY_ZOOKEEPER_CONNECT_STRING rmr $rootNode"
cd $DOLPHINSCHEDULER_HOME
$JAVA_HOME/bin/java $exec_command
[dolphinscheduler] 03/03: [feat] ui build no inherit from maven proxy (#10590)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a commit to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit c27fa1ab0de9506802289b751af7b4d8b27646ee
Author: Jiajie Zhong <zh...@hotmail.com>
AuthorDate: Fri Jun 24 13:35:36 2022 +0800
[feat] ui build no inherit from maven proxy (#10590)
Users may set in for maven setting.xml. but
frontend-maven-plugin will inherit proxy setting
from it. And pnpm not support both `--proxy` and
`--https-proxy` and will fail ui build. This patch
make pnpm run without inherits maven proxy.
ref: https://github.com/eirslett/frontend-maven-plugin#proxy-settings
and https://github.com/eirslett/frontend-maven-plugin/blob/9f39dbad0948237ada4e7b19bf90690f94a61b81/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/PnpmMojo.java#L28
(cherry picked from commit 15a86071d14c83b6a40557ea49ea39ac46cd9057)
---
dolphinscheduler-ui/pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 76144ad270..9624cb941a 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -43,6 +43,9 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
+ <configuration>
+ <pnpmInheritsProxyConfigFromMaven>false</pnpmInheritsProxyConfigFromMaven>
+ </configuration>
<executions>
<execution>
<id>install node and pnpm</id>