Skip to content

[Fix-18286] Use real existing workerGroups more accurately instead of defaulting to 'default' #18287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
KaiSong-UK wants to merge 6 commits into from
+12 −9
Closed

[Fix-18286] Use real existing workerGroups more accurately instead of defaulting to 'default' #18287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af5ad82
Update PostgreSQL Helm chart version to 18.6.7
KaiSong-UK May 22, 2026
54737dc
Update MinIO chart version to 17.0.21
KaiSong-UK May 22, 2026
63b901c
[Fix-18286] Remove hardcoded default workerGroup defaultValue
KaiSong-UK May 22, 2026
36786dc
test
KaiSong-UK May 22, 2026
baa2af2
Remove test file
KaiSong-UK May 22, 2026
f817c15
[Fix-18286] Remove hardcoded default workerGroup defaultValue in Exec…
KaiSong-UK May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/kubernetes/dolphinscheduler/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ appVersion: 3.1.0

dependencies:
- name: postgresql
version: 12.1.5
version: 18.6.7
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
- name: zookeeper
Expand All @@ -55,6 +55,6 @@ dependencies:
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
condition: mysql.enabled
- name: minio
version: 11.10.26
version: 17.0.21
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
condition: minio.enabled
condition: minio.enabled
7 changes: 4 additions & 3 deletions ...uler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
@RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
@RequestParam(value = "runMode", required = false) RunMode runMode,
@RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
@RequestParam(value = "startParams", required = false) String startParams,
Expand Down Expand Up @@ -257,7 +257,7 @@ public Result<List<Integer>> batchTriggerWorkflowDefinitions(@Parameter(hidden =
@RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
@RequestParam(value = "runMode", required = false) RunMode runMode,
@RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
@RequestParam(value = "startParams", required = false) String startParams,
Expand Down Expand Up @@ -391,7 +391,7 @@ public Result<Boolean> startStreamTaskInstance(@Parameter(hidden = true) @Reques
@Parameter(name = "code", description = "TASK_CODE", required = true) @PathVariable long code,
@RequestParam(value = "version", required = true) int version,
@RequestParam(value = "warningGroupId", required = false, defaultValue = "0") Integer warningGroupId,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
@RequestParam(value = "startParams", required = false) String startParams,
Expand Down Expand Up @@ -441,3 +441,4 @@ public Result executeTask(@Parameter(hidden = true) @RequestAttribute(value = Co
}

}

8 changes: 5 additions & 3 deletions ...ler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public Result<Schedule> createSchedule(@Parameter(hidden = true) @RequestAttribu
@RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType,
@RequestParam(value = "warningGroupId", required = false, defaultValue = DEFAULT_NOTIFY_GROUP_ID) int warningGroupId,
@RequestParam(value = "failureStrategy", required = false, defaultValue = DEFAULT_FAILURE_POLICY) FailureStrategy failureStrategy,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
@RequestParam(value = "workflowInstancePriority", required = false, defaultValue = DEFAULT_WORKFLOW_INSTANCE_PRIORITY) Priority workflowInstancePriority) {
Expand Down Expand Up @@ -170,7 +170,7 @@ public Result<Schedule> updateSchedule(@Parameter(hidden = true) @RequestAttribu
@RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType,
@RequestParam(value = "warningGroupId", required = false, defaultValue = DEFAULT_NOTIFY_GROUP_ID) int warningGroupId,
@RequestParam(value = "failureStrategy", required = false, defaultValue = "END") FailureStrategy failureStrategy,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
@RequestParam(value = "workflowInstancePriority", required = false, defaultValue = DEFAULT_WORKFLOW_INSTANCE_PRIORITY) Priority workflowInstancePriority) {
Expand Down Expand Up @@ -337,7 +337,7 @@ public Result<Schedule> updateScheduleByWorkflowDefinitionCode(@Parameter(hidden
@RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType,
@RequestParam(value = "warningGroupId", required = false) int warningGroupId,
@RequestParam(value = "failureStrategy", required = false, defaultValue = "END") FailureStrategy failureStrategy,
@RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
@RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup,
@RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
@RequestParam(value = "environmentCode", required = false, defaultValue = "-1") long environmentCode,
@RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority) {
Expand All @@ -348,3 +348,5 @@ public Result<Schedule> updateScheduleByWorkflowDefinitionCode(@Parameter(hidden
return Result.success(updatedSchedule);
}
}


Loading