Skip to content
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

[Feature-2815][server] One worker can belong to different workergroups #2934

Merged
merged 9 commits into from Jul 13, 2020

Conversation

yangyichao-mango
Copy link
Contributor

@yangyichao-mango yangyichao-mango commented Jun 9, 2020

What is the purpose of the pull request

Implement one worker can belong to different workergroups(#2591 ) (#2815 )

Brief change log

  • Change worker.properties file's worker.group conf to worker.groups
  • Change server/worker/config/WorkerConfig#workerGroup to server/worker/config/WorkerConfig#workerGroups
  • Change workerRegistry to registry one worker to muti-groups
  • Add tests for this issue

Verify this pull request

This change added tests and can be verified as follows:

  • Changed WorkerRegistryTest to verify the change.

image

@codecov-commenter
Copy link

codecov-commenter commented Jun 9, 2020

Codecov Report

Merging #2934 into dev will decrease coverage by 0.13%.
The diff coverage is 1.09%.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #2934      +/-   ##
============================================
- Coverage     33.52%   33.38%   -0.14%     
+ Complexity     2393     2389       -4     
============================================
  Files           442      443       +1     
  Lines         20596    20648      +52     
  Branches       2522     2526       +4     
============================================
- Hits           6905     6894      -11     
- Misses        13029    13094      +65     
+ Partials        662      660       -2     
Impacted Files Coverage Δ Complexity Δ
...lphinscheduler/common/model/WorkerServerModel.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...heduler/server/master/registry/MasterRegistry.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...olphinscheduler/server/registry/HeartBeatTask.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...inscheduler/server/worker/config/WorkerConfig.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...heduler/server/worker/registry/WorkerRegistry.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...e/dolphinscheduler/api/service/MonitorService.java 13.63% <4.34%> (-11.37%) 2.00 <1.00> (ø)
...he/dolphinscheduler/common/enums/SqoopJobType.java 0.00% <0.00%> (-88.89%) 0.00% <0.00%> (-3.00%)
...he/dolphinscheduler/api/service/LoggerService.java 82.60% <0.00%> (-8.70%) 9.00% <0.00%> (-1.00%)
...inscheduler/common/task/sqoop/SqoopParameters.java 74.00% <0.00%> (-2.00%) 25.00% <0.00%> (ø%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d1282fd...db9de61. Read the comment docs.

@yangyichao-mango yangyichao-mango changed the title [Feature-2591][server] One worker can belong to different workergroups [Feature-2591 2815][server] One worker can belong to different workergroups Jun 9, 2020
@yangyichao-mango yangyichao-mango changed the title [Feature-2591 2815][server] One worker can belong to different workergroups [Feature-2815][server] One worker can belong to different workergroups Jun 9, 2020
@davidzollo
Copy link
Contributor

sorry for not review in time, please solve conflicting files first

@yangyichao-mango
Copy link
Contributor Author

Thx a lot for your review @dailidong , I've rebased the branch and resolved the conflicts.

@yangyichao-mango yangyichao-mango force-pushed the feature-2591 branch 2 times, most recently from 7c9acd0 to f53450b Compare July 3, 2020 04:26
@yangyichao-mango yangyichao-mango force-pushed the feature-2591 branch 2 times, most recently from ddfea80 to 40f9f25 Compare July 3, 2020 10:00
Copy link
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

good job

Copy link
Contributor

@qiaozhanwei qiaozhanwei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 please resove conflicting , Thx

@sonarcloud
Copy link

sonarcloud bot commented Jul 13, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 1 Code Smell

41.6% 41.6% Coverage
0.0% 0.0% Duplication

@yangyichao-mango
Copy link
Contributor Author

+1 please resove conflicting , Thx

Hi,
Thx a lot for your review, I have resolved the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants