Skip to content

Commit 64a29b8

Browse files
pegasaspegasas
committed
test
1 parent ac1eaca commit 64a29b8

File tree

12 files changed

+57
-92
lines changed

12 files changed

+57
-92
lines changed

‎dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,16 @@ alert:
7777
sender-parallelism: 100
7878

7979
registry:
80-
type: zookeeper
81-
zookeeper:
82-
namespace: dolphinscheduler
83-
connect-string: localhost:2181
84-
retry-policy:
85-
base-sleep-time: 60ms
86-
max-sleep: 300ms
87-
max-retries: 5
88-
session-timeout: 30s
89-
connection-timeout: 9s
90-
block-until-connected: 600ms
91-
digest: ~
80+
type: jdbc
81+
term-refresh-interval: 2s
82+
term-expire-times: 3
83+
hikari-config:
84+
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
85+
username: root
86+
password: root
87+
maximum-pool-size: 5
88+
connection-timeout: 9000
89+
idle-timeout: 600000
9290

9391
metrics:
9492
enabled: true

‎dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@
4646
</appender>
4747

4848
<root level="INFO">
49-
<if condition="${DOCKER:-false}">
50-
<then>
51-
<appender-ref ref="STDOUT"/>
52-
</then>
53-
</if>
49+
<appender-ref ref="STDOUT"/>
5450
<appender-ref ref="ALERTLOGFILE"/>
5551
</root>
5652
</configuration>

‎dolphinscheduler-api/src/main/resources/application.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,16 @@ management:
113113
application: ${spring.application.name}
114114

115115
registry:
116-
type: zookeeper
117-
zookeeper:
118-
namespace: dolphinscheduler
119-
connect-string: localhost:2181
120-
retry-policy:
121-
base-sleep-time: 60ms
122-
max-sleep: 300ms
123-
max-retries: 5
124-
session-timeout: 60s
125-
connection-timeout: 15s
126-
block-until-connected: 15s
127-
digest: ~
116+
type: jdbc
117+
term-refresh-interval: 2s
118+
term-expire-times: 3
119+
hikari-config:
120+
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
121+
username: root
122+
password: root
123+
maximum-pool-size: 5
124+
connection-timeout: 9000
125+
idle-timeout: 600000
128126

129127
api:
130128
audit-enable: false

‎dolphinscheduler-api/src/main/resources/logback-spring.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@
5151
<logger name="org.apache.hadoop" level="WARN"/>
5252

5353
<root level="INFO">
54-
<if condition="${DOCKER:-false}">
55-
<then>
56-
<appender-ref ref="STDOUT"/>
57-
</then>
58-
</if>
54+
<appender-ref ref="STDOUT" />
5955
<appender-ref ref="APILOGFILE"/>
6056
</root>
6157
</configuration>

‎dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/resources/aws.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ aws:
2121
# AWSStaticCredentialsProvider: use the access key and secret key to authenticate
2222
# InstanceProfileCredentialsProvider: use the IAM role to authenticate
2323
credentials.provider.type: AWSStaticCredentialsProvider
24-
access.key.id: accessKey123
25-
access.key.secret: secretKey123
24+
access.key.id: minioadmin
25+
access.key.secret: minioadmin
2626
region: us-east-1
2727
bucket.name: dolphinscheduler
28-
endpoint: http://s3:9000
28+
endpoint: http://localhost:9000
2929
emr:
3030
# The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
3131
# AWSStaticCredentialsProvider: use the access key and secret key to authenticate

‎dolphinscheduler-common/src/main/resources/common.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data.basedir.path=/tmp/dolphinscheduler
2424
# resource storage type: LOCAL, HDFS, S3, OSS, GCS, ABS, OBS. LOCAL type is default type, and it's a specific type of HDFS with "resource.hdfs.fs.defaultFS = file:///" configuration
2525
# please notice that LOCAL mode does not support reading and writing in distributed mode, which mean you can only use your resource in one machine, unless
2626
# use shared file mount point
27-
resource.storage.type=LOCAL
27+
resource.storage.type=S3
2828
# resource store on HDFS/S3 path, resource file will store to this base path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
2929
resource.storage.upload.base.path=/dolphinscheduler
3030

‎dolphinscheduler-master/src/main/resources/application.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,16 @@ mybatis-plus:
6868

6969

7070
registry:
71-
type: zookeeper
72-
zookeeper:
73-
namespace: dolphinscheduler
74-
connect-string: localhost:2181
75-
retry-policy:
76-
base-sleep-time: 60ms
77-
max-sleep: 300ms
78-
max-retries: 5
79-
session-timeout: 30s
80-
connection-timeout: 9s
81-
block-until-connected: 600ms
82-
digest: ~
71+
type: jdbc
72+
term-refresh-interval: 2s
73+
term-expire-times: 3
74+
hikari-config:
75+
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
76+
username: root
77+
password: root
78+
maximum-pool-size: 5
79+
connection-timeout: 9000
80+
idle-timeout: 600000
8381

8482
master:
8583
listen-port: 5678

‎dolphinscheduler-master/src/main/resources/logback-spring.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@
6767
</encoder>
6868
</appender>
6969

70-
<root level="INFO">
71-
<if condition="${DOCKER:-false}">
72-
<then>
73-
<appender-ref ref="STDOUT"/>
74-
</then>
75-
</if>
70+
<root level="DEBUG">
71+
<appender-ref ref="STDOUT" />
7672
<appender-ref ref="TASKLOGFILE"/>
7773
<appender-ref ref="MASTERLOGFILE"/>
7874
</root>

‎dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java

+5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ protected void generateShellScript() throws IOException {
4848
finalScripts.add(shellHeader());
4949
finalScripts.add("BASEDIR=$(cd `dirname $0`; pwd)");
5050
finalScripts.add("cd $BASEDIR");
51+
finalScripts.add("export JAVA_HOME=/usr/local/jdk1.8.0_371");
52+
finalScripts.add("export HADOOP_HOME=/opt/apache/hadoop-3.3.6");
53+
finalScripts.add("export HIVE_HOME=/opt/apache/apache-hive-3.1.3-bin");
54+
finalScripts.add("export SPARK_HOME=/opt/apache/spark-3.5.0-bin-hadoop3");
55+
finalScripts.add("export FLINK_HOME=/opt/apache/flink-1.18.1");
5156
// add system env
5257
finalScripts.addAll(systemEnvScript());
5358
// add custom env

‎dolphinscheduler-ui/pnpm-lock.yaml

+1-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dolphinscheduler-worker/src/main/resources/application.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,16 @@ spring:
2525
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
2626

2727
registry:
28-
type: zookeeper
29-
zookeeper:
30-
namespace: dolphinscheduler
31-
connect-string: localhost:2181
32-
retry-policy:
33-
base-sleep-time: 60ms
34-
max-sleep: 300ms
35-
max-retries: 5
36-
session-timeout: 30s
37-
connection-timeout: 9s
38-
block-until-connected: 600ms
39-
digest: ~
28+
type: jdbc
29+
term-refresh-interval: 2s
30+
term-expire-times: 3
31+
hikari-config:
32+
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
33+
username: root
34+
password: root
35+
maximum-pool-size: 5
36+
connection-timeout: 9000
37+
idle-timeout: 600000
4038

4139
worker:
4240
# worker listener port

‎dolphinscheduler-worker/src/main/resources/logback-spring.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,9 @@
6767
</encoder>
6868
</appender>
6969

70-
<root level="INFO">
71-
<if condition="${DOCKER:-false}">
72-
<then>
73-
<appender-ref ref="STDOUT"/>
74-
</then>
75-
</if>
70+
<root level="DEBUG">
71+
<appender-ref ref="STDOUT" />
7672
<appender-ref ref="TASKLOGFILE"/>
7773
<appender-ref ref="WORKERLOGFILE"/>
7874
</root>
79-
</configuration>
75+
</configuration>

0 commit comments

Comments
 (0)