natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

This commit is contained in:
pegasas 2024-06-10 10:45:45 +08:00
parent d6714bb77a
commit 525a446bd6
13 changed files with 59 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml
View File

@ -77,18 +77,16 @@ alert:
sender-parallelism: 100
registry:
type: zookeeper
zookeeper:
namespace: dolphinscheduler
connect-string: localhost:2181
retry-policy:
base-sleep-time: 60ms
max-sleep: 300ms
max-retries: 5
session-timeout: 30s
connection-timeout: 9s
block-until-connected: 600ms
digest: ~
type: jdbc
term-refresh-interval: 2s
term-expire-times: 3
hikari-config:
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
username: root
password: root
maximum-pool-size: 5
connection-timeout: 9000
idle-timeout: 600000
metrics:
enabled: true

6
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml
View File

@ -46,11 +46,7 @@
</appender>
<root level="INFO">
<if condition="${DOCKER:-false}">
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>
<appender-ref ref="STDOUT"/>
<appender-ref ref="ALERTLOGFILE"/>
</root>
</configuration>

22
dolphinscheduler-api/src/main/resources/application.yaml
View File

@ -113,18 +113,16 @@ management:
application: ${spring.application.name}
registry:
type: zookeeper
zookeeper:
namespace: dolphinscheduler
connect-string: localhost:2181
retry-policy:
base-sleep-time: 60ms
max-sleep: 300ms
max-retries: 5
session-timeout: 60s
connection-timeout: 15s
block-until-connected: 15s
digest: ~
type: jdbc
term-refresh-interval: 2s
term-expire-times: 3
hikari-config:
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
username: root
password: root
maximum-pool-size: 5
connection-timeout: 9000
idle-timeout: 600000
api:
audit-enable: false

6
dolphinscheduler-api/src/main/resources/logback-spring.xml
View File

@ -51,11 +51,7 @@
<logger name="org.apache.hadoop" level="WARN"/>
<root level="INFO">
<if condition="${DOCKER:-false}">
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>
<appender-ref ref="STDOUT" />
<appender-ref ref="APILOGFILE"/>
</root>
</configuration>

6
dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/resources/aws.yaml
View File

@ -21,11 +21,11 @@ aws:
# AWSStaticCredentialsProvider: use the access key and secret key to authenticate
# InstanceProfileCredentialsProvider: use the IAM role to authenticate
credentials.provider.type: AWSStaticCredentialsProvider
access.key.id: accessKey123
access.key.secret: secretKey123
access.key.id: minioadmin
access.key.secret: minioadmin
region: us-east-1
bucket.name: dolphinscheduler
endpoint: http://s3:9000
endpoint: http://localhost:9000
emr:
# The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
# AWSStaticCredentialsProvider: use the access key and secret key to authenticate

2
dolphinscheduler-common/src/main/resources/common.properties
View File

@ -24,7 +24,7 @@ data.basedir.path=/tmp/dolphinscheduler
# 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
# 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
# use shared file mount point
resource.storage.type=LOCAL
resource.storage.type=S3
# 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
resource.storage.upload.base.path=/dolphinscheduler

22
dolphinscheduler-master/src/main/resources/application.yaml
View File

@ -68,18 +68,16 @@ mybatis-plus:
registry:
type: zookeeper
zookeeper:
namespace: dolphinscheduler
connect-string: localhost:2181
retry-policy:
base-sleep-time: 60ms
max-sleep: 300ms
max-retries: 5
session-timeout: 30s
connection-timeout: 9s
block-until-connected: 600ms
digest: ~
type: jdbc
term-refresh-interval: 2s
term-expire-times: 3
hikari-config:
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
username: root
password: root
maximum-pool-size: 5
connection-timeout: 9000
idle-timeout: 600000
master:
listen-port: 5678

8
dolphinscheduler-master/src/main/resources/logback-spring.xml
View File

@ -67,12 +67,8 @@
</encoder>
</appender>
<root level="INFO">
<if condition="${DOCKER:-false}">
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
<appender-ref ref="TASKLOGFILE"/>
<appender-ref ref="MASTERLOGFILE"/>
</root>

5
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
View File

@ -48,6 +48,11 @@ public abstract class BaseLinuxShellInterceptorBuilder<T extends BaseLinuxShellI
finalScripts.add(shellHeader());
finalScripts.add("BASEDIR=$(cd `dirname $0`; pwd)");
finalScripts.add("cd $BASEDIR");
finalScripts.add("export JAVA_HOME=/usr/local/jdk1.8.0_371");
finalScripts.add("export HADOOP_HOME=/opt/apache/hadoop-3.3.6");
finalScripts.add("export HIVE_HOME=/opt/apache/apache-hive-3.1.3-bin");
finalScripts.add("export SPARK_HOME=/opt/apache/spark-3.5.0-bin-hadoop3");
finalScripts.add("export FLINK_HOME=/opt/apache/flink-1.18.1");
// add system env
finalScripts.addAll(systemEnvScript());
// add custom env

18
dolphinscheduler-ui/pnpm-lock.yaml
View File

@ -1,20 +1,4 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
lockfileVersion: 5.4
lockfileVersion: 5.3
specifiers:
'@antv/layout': 0.1.31

3
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TenantUtils.java
View File

@ -56,7 +56,8 @@ public class TenantUtils {
String tenantCode = taskExecutionContext.getTenantCode();
if (isDefaultTenant(tenantCode)) {
if (tenantConfig.isDefaultTenantEnabled()) {
// if (tenantConfig.isDefaultTenantEnabled()) {
if (true) {
log.info("Current tenant is default tenant, will use bootstrap user: {} to execute the task",
getBootstrapTenant());
return getBootstrapTenant();

22
dolphinscheduler-worker/src/main/resources/application.yaml
View File

@ -25,18 +25,16 @@ spring:
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
registry:
type: zookeeper
zookeeper:
namespace: dolphinscheduler
connect-string: localhost:2181
retry-policy:
base-sleep-time: 60ms
max-sleep: 300ms
max-retries: 5
session-timeout: 30s
connection-timeout: 9s
block-until-connected: 600ms
digest: ~
type: jdbc
term-refresh-interval: 2s
term-expire-times: 3
hikari-config:
jdbc-url: jdbc:postgresql://localhost:5432/dolphinscheduler
username: root
password: root
maximum-pool-size: 5
connection-timeout: 9000
idle-timeout: 600000
worker:
# worker listener port

10
dolphinscheduler-worker/src/main/resources/logback-spring.xml
View File

@ -67,13 +67,9 @@
</encoder>
</appender>
<root level="INFO">
<if condition="${DOCKER:-false}">
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
<appender-ref ref="TASKLOGFILE"/>
<appender-ref ref="WORKERLOGFILE"/>
</root>
</configuration>
</configuration>