This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 8493aa8 simplify common config (#2613)
8493aa8 is described below
commit 8493aa8209b7a47745bd753f1e943ed617a25401
Author: dailidong <[email protected]>
AuthorDate: Fri May 8 16:08:08 2020 +0800
simplify common config (#2613)
* update README about DolphinScheduler
* Update issue templates
* update
* regularize api pom xml
update rpc maven compile to 1.8
* regularize api pom xml
* change commons.lang3.StringUtils to common.utils.StringUtils
* update pom.xml
* update
* correct equals method
* jasper-runtime is needed when api server start
* jasper-runtime jar is needed when api server start
* combine logback config of master/worker/alert/api server to one
logback.xml
* remove tomcat runtime jar
* add UT
* add license
* remove jasper-runtime jar, not need anymore
* sovle jar conflict， remove servlet-api 2.5 jar
* remove servlet 2.5
* add embedded database h2 and update embedded zookeeper
* delete logs
* add license
* change log level to INFO
* simplify and optimize config
* add development state
* simplify common config
Co-authored-by: lidongdai <[email protected]>
Co-authored-by: dailidong <[email protected]>
---
.../src/main/resources/common.properties | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dolphinscheduler-common/src/main/resources/common.properties
b/dolphinscheduler-common/src/main/resources/common.properties
index d066f7b..3852c31 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -19,22 +19,22 @@
resource.storage.type=NONE
# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration, please make sure the directory exists on hdfs and
have read write permissions。"/dolphinscheduler" is recommended
-resource.upload.path=/dolphinscheduler
+#resource.upload.path=/dolphinscheduler
# user data local directory path, please make sure the directory exists and
have read write permissions
#data.basedir.path=/tmp/dolphinscheduler
# whether kerberos starts
-hadoop.security.authentication.startup.state=false
+#hadoop.security.authentication.startup.state=false
# java.security.krb5.conf path
-java.security.krb5.conf.path=/opt/krb5.conf
+#java.security.krb5.conf.path=/opt/krb5.conf
# login user from keytab username
[email protected]
+#[email protected]
# loginUserFromKeytab path
-login.user.keytab.path=/opt/hdfs.headless.keytab
+#login.user.keytab.path=/opt/hdfs.headless.keytab
#resource.view.suffixs
#resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
@@ -46,18 +46,18 @@ hdfs.root.user=hdfs
fs.defaultFS=hdfs://mycluster:8020
# if resource.storage.type=S3，s3 endpoint
-fs.s3a.endpoint=http://192.168.199.91:9010
+#fs.s3a.endpoint=http://192.168.199.91:9010
# if resource.storage.type=S3，s3 access key
-fs.s3a.access.key=A3DXS30FO22544RE
+#fs.s3a.access.key=A3DXS30FO22544RE
# if resource.storage.type=S3，s3 secret key
-fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
+#fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
# if not use hadoop resourcemanager, please keep default value; if
resourcemanager HA enable, please type the HA ips ; if resourcemanager is
single, make this value empty
yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
-# if resourcemanager HA enable or not use resourcemanager, please keep the
default value; If resourcemanager is single, you only need to replace ark1 to
actual resourcemanager hostname.
+# If resourcemanager HA enable or not use resourcemanager, please keep the
default value; If resourcemanager is single, you only need to replace ark1 to
actual resourcemanager hostname.
yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
# system env path
