Skip to content

Commit d82fd49

Browse files
SbloodySSbloodyS
authored
Merge branch 'dev' into Improvement-17025
2 parents d6c7e6a + b66d099 commit d82fd49

File tree

101 files changed

+1183
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1183
-355
lines changed

Diff for: ‎.asf.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,18 @@ github:
5353
required_pull_request_reviews:
5454
dismiss_stale_reviews: true
5555
required_approving_review_count: 2
56+
features:
57+
# Enable issues management
58+
issues: true
59+
# Enable projects for project management boards
60+
projects: false
61+
# Enable wiki for documentation
62+
wiki: false
63+
# Enable discussions
64+
discussions: true
65+
66+
notifications:
67+
commits: [email protected]
68+
issues: [email protected]
69+
pullrequests: [email protected]
70+
discussions: [email protected]

Diff for: ‎.github/ISSUE_TEMPLATE/bug-report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ body:
101101
- dev
102102
- 3.1.x
103103
- 3.2.x
104+
- 3.3.0-alpha
104105
validations:
105106
required: true
106107

Diff for: ‎.github/workflows/api-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@v3.0.2
4242
id: filter
4343
with:
4444
filters: |

Diff for: ‎.github/workflows/backend.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
db-schema: ${{ steps.filter.outputs.db-schema }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@v3.0.2
4242
id: filter
4343
with:
4444
filters: |

Diff for: ‎.github/workflows/cluster-test/mysql_with_mysql_registry/dolphinscheduler_env.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ export DATAX_LAUNCHER=${DATAX_LAUNCHER:-/opt/soft/datax/bin/datax.py}
4646

4747
export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_LAUNCHER:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$DATAX_LAUNCHER:$PATH
4848

49-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
50-
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
51-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
52-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
53-
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
54-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
49+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
50+
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
51+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
52+
export MASTER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
53+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
54+
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
55+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
56+
export WORKER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
5557

5658
# applicationId auto collection related configuration, the following configurations are unnecessary if setting appId.collect=log
5759
#export HADOOP_CLASSPATH=`hadoop classpath`:${DOLPHINSCHEDULER_HOME}/tools/libs/*

Diff for: ‎.github/workflows/cluster-test/mysql_with_zookeeper_registry/dolphinscheduler_env.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ export DATAX_LAUNCHER=${DATAX_LAUNCHER:-/opt/soft/datax/bin/datax.py}
4545

4646
export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_LAUNCHER:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$DATAX_LAUNCHER:$PATH
4747

48-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
49-
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
50-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
51-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
52-
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
53-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
48+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
49+
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
50+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
51+
export MASTER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
52+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
53+
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
54+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
55+
export WORKER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
5456

5557
# applicationId auto collection related configuration, the following configurations are unnecessary if setting appId.collect=log
5658
#export HADOOP_CLASSPATH=`hadoop classpath`:${DOLPHINSCHEDULER_HOME}/tools/libs/*

Diff for: ‎.github/workflows/cluster-test/postgresql_with_postgresql_registry/dolphinscheduler_env.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ export DATAX_LAUNCHER=${DATAX_LAUNCHER:-/opt/soft/datax/bin/datax.py}
4646

4747
export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_LAUNCHER:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$DATAX_LAUNCHER:$PATH
4848

49-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
50-
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
51-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
52-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
53-
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
54-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
49+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
50+
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
51+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
52+
export MASTER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
53+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
54+
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
55+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
56+
export WORKER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
5557

5658
# applicationId auto collection related configuration, the following configurations are unnecessary if setting appId.collect=log
5759
#export HADOOP_CLASSPATH=`hadoop classpath`:${DOLPHINSCHEDULER_HOME}/tools/libs/*

Diff for: ‎.github/workflows/cluster-test/postgresql_with_zookeeper_registry/dolphinscheduler_env.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ export DATAX_LAUNCHER=${DATAX_LAUNCHER:-/opt/soft/datax/bin/datax.py}
4545

4646
export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_LAUNCHER:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$DATAX_LAUNCHER:$PATH
4747

48-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
49-
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
50-
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
51-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
52-
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.7
53-
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.7
48+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
49+
export MASTER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
50+
export MASTER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
51+
export MASTER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
52+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
53+
export WORKER_SERVER_LOAD_PROTECTION_MAX_JVM_CPU_USAGE_PERCENTAGE_THRESHOLDS=0.9
54+
export WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS=0.9
55+
export WORKER_SERVER_LOAD_PROTECTION_MAX_DISK_USAGE_PERCENTAGE_THRESHOLDS=0.9
5456

5557
# applicationId auto collection related configuration, the following configurations are unnecessary if setting appId.collect=log
5658
#export HADOOP_CLASSPATH=`hadoop classpath`:${DOLPHINSCHEDULER_HOME}/tools/libs/*

Diff for: ‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
helm-doc: ${{ steps.filter.outputs.helm-doc }}
7878
steps:
7979
- uses: actions/checkout@v4
80-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
80+
- uses: dorny/paths-filter@v3.0.2
8181
id: filter
8282
with:
8383
filters: |

Diff for: ‎.github/workflows/e2e-k8s.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@v3.0.2
4242
id: filter
4343
with:
4444
filters: |

Diff for: ‎.github/workflows/e2e.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4141
steps:
4242
- uses: actions/checkout@v4
43-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
43+
- uses: dorny/paths-filter@v3.0.2
4444
id: filter
4545
with:
4646
filters: |
@@ -146,6 +146,19 @@ jobs:
146146
env:
147147
RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
148148
steps:
149+
- uses: actions/checkout@v4
150+
with:
151+
submodules: true
152+
- name: Maximize runner space
153+
uses: ./.github/actions/maximize-build-space
154+
with:
155+
root-reserve-mb: 30720
156+
temp-reserve-mb: 10240
157+
remove-dotnet: 'true'
158+
remove-android: 'true'
159+
remove-haskell: 'true'
160+
remove-codeql: 'true'
161+
remove-docker-images: 'true'
149162
- uses: actions/checkout@v4
150163
with:
151164
submodules: true

Diff for: ‎.github/workflows/frontend.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4444
steps:
4545
- uses: actions/checkout@v4
46-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
46+
- uses: dorny/paths-filter@v3.0.2
4747
id: filter
4848
with:
4949
filters: |

Diff for: ‎.github/workflows/publish-nexus.yaml

-76
This file was deleted.

Diff for: ‎.github/workflows/publish-nexus/release-asf-settings.xml

-34
This file was deleted.

Diff for: ‎.github/workflows/publish-nexus/snapshot-asf-settings.xml

-29
This file was deleted.

Diff for: ‎.github/workflows/unit-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4444
steps:
4545
- uses: actions/checkout@v4
46-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
46+
- uses: dorny/paths-filter@v3.0.2
4747
id: filter
4848
with:
4949
filters: |

Diff for: ‎docs/configs/index.md.jsx

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import docs319Config from '../../../site_config/docs3-1-9';
6464
import docs320Config from '../../../site_config/docs3-2-0';
6565
import docs321Config from '../../../site_config/docs3-2-1';
6666
import docs322Config from '../../../site_config/docs3-2-2';
67+
import docs330Config from '../../../site_config/docs3-3-0-alpha';
6768
import docsDevConfig from '../../../site_config/docsdev';
6869

6970
const docsSource = {
@@ -104,6 +105,7 @@ const docsSource = {
104105
'3.2.0': docs320Config,
105106
'3.2.1': docs321Config,
106107
'3.2.2': docs322Config,
108+
'3.3.0-alpha': docs330Config,
107109
dev: docsDevConfig,
108110
};
109111

Diff for: ‎docs/configs/site.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default {
2424
port: 8080,
2525
domain: 'dolphinscheduler.apache.org',
2626
copyToDist: ['asset', 'img', 'file', '.asf.yaml', 'sitemap.xml', '.nojekyll', '.htaccess', 'googled0df7b96f277a143.html'],
27-
docsLatest: '3.2.2',
27+
docsLatest: '3.3.0-alpha',
2828
defaultSearch: 'google', // default search engine
2929
defaultLanguage: 'en-us',
3030
'en-us': {
@@ -45,7 +45,7 @@ export default {
4545
children: [
4646
{
4747
key: 'docs0',
48-
text: 'latest(3.2.2)',
48+
text: 'latest(3.3.0-alpha)',
4949
link: '/en-us/docs/latest/user_doc/about/introduction.html',
5050
},
5151
{
@@ -173,7 +173,7 @@ export default {
173173
children: [
174174
{
175175
key: 'docs0',
176-
text: '最新版本latest(3.2.2)',
176+
text: '最新版本latest(3.3.0-alpha)',
177177
link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
178178
},
179179
{

0 commit comments

Comments
 (0)