-
Notifications
You must be signed in to change notification settings - Fork 5.1k
[Improvement-18286][ApiServer] Remove the default workerGroup from the frontend and add backend validation for workerGroup #18293
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.
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
Open
njnu-seafish
wants to merge
47
commits into
apache:dev
Choose a base branch
from
njnu-seafish:Improvement-18286
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,076
−117
Open
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
3a82410
Remove the default workerGroup from the frontend and add backend vali…
1d4e03d
update import
8d60888
Merge branch 'apache:dev' into Improvement-18286
njnu-seafish a497475
Optimize some issues.
6c7c487
Merge branch 'dev' into Improvement-18286
SbloodyS 1c0c970
update unit test
b9575ef
Merge branch 'dev' into Improvement-18286
njnu-seafish 96647e1
Merge branch 'dev' into Improvement-18286
njnu-seafish 9acd656
Merge branch 'dev' into Improvement-18286
njnu-seafish 9f6e1bb
Merge branch 'dev' into Improvement-18286
njnu-seafish fe79ac0
Merge branch 'apache:dev' into Improvement-18286
njnu-seafish 1a4e69f
update test
fa6a00e
Merge branch 'dev' into Improvement-18286
njnu-seafish 2bde4ce
The default worker group is assigned to all projects by default.
6429a6f
Merge branch 'Improvement-18286' of github.com:njnu-seafish/dolphinsc…
743117e
Merge branch 'apache:dev' into Improvement-18286
njnu-seafish 1ad45ac
Fix E2E test failure: wait for task modal to close before workflow save
564cee2
Merge branch 'dev' into Improvement-18286
SbloodyS 74919b0
Fix E2E test failure: Wait for save button to be clickable in Workflo…
978df66
Merge branch 'dev' into Improvement-18286
njnu-seafish b4c698b
Resolve workerGroup validation race condition in E2E tests
f2531a5
format frontend code
9cd44c6
Merge branch 'Improvement-18286' of github.com:njnu-seafish/dolphinsc…
3cbac05
Merge branch 'dev' into Improvement-18286
njnu-seafish a75eacc
Merge branch 'dev' into Improvement-18286
njnu-seafish f327266
Merge branch 'dev' into Improvement-18286
njnu-seafish 861d8c7
Merge branch 'apache:dev' into Improvement-18286
njnu-seafish 1ab127d
remove WebDriverWaitFactory.createWebDriverWait
9b1fa14
add WebDriverWaitFactory.createWebDriverWait
ecc17f3
Fix E2E tests: add setWorkerGroup() for all task types to prevent mod…
26ab2f7
Merge branch 'dev' into Improvement-18286
njnu-seafish 62bd6ce
add import
fb82c9b
Pre-assign project worker group before selecting task worker group in…
9b6d650
Merge branch 'dev' into Improvement-18286
njnu-seafish 8064469
Merge branch 'dev' into Improvement-18286
njnu-seafish 79503f4
Merge branch 'dev' into Improvement-18286
njnu-seafish 5346c6c
Merge branch 'dev' into Improvement-18286
njnu-seafish b45ff0b
Merge branch 'dev' into Improvement-18286
SbloodyS 469315a
Reject empty/default as implicit worker group; require explicit assig…
fde389d
Assign default worker group to projects before creating workflows in …
1c0dfe0
Fix array parameter serialization in RequestClient.getParams()
6df6870
Add assertions for assignWorkerGroups in API tests
951c41a
resolve element click intercepted error in testRemoveWorkerGroup by u…
c78a7cf
Fix form parameter parsing for POST/PUT requests in RequestClient
1d5f658
ensure 'default' worker group exists before project creation in e2e test
fd37dcf
Merge branch 'dev' into Improvement-18286
njnu-seafish ee68ec6
Merge branch 'dev' into Improvement-18286
njnu-seafish File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...cheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ProjectPreferencesDTO.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.apache.dolphinscheduler.api.dto; | ||
|
|
||
| import lombok.Data; | ||
|
|
||
| @Data | ||
| public class ProjectPreferencesDTO { | ||
|
|
||
| private String taskPriority; | ||
|
|
||
| private String workerGroup; | ||
|
|
||
| private Long environmentCode; | ||
|
|
||
| private Integer failRetryTimes; | ||
|
|
||
| private Integer failRetryInterval; | ||
|
|
||
| private Integer cpuQuota; | ||
|
|
||
| private Integer memoryMax; | ||
|
|
||
| private Boolean timeoutFlag; | ||
|
|
||
| private String[] timeoutNotifyStrategy; | ||
|
|
||
| private Integer timeout; | ||
|
|
||
| private String warningType; | ||
|
|
||
| private String tenantCode; | ||
|
|
||
| private Integer warningGroupId; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.