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

[#80][Part-2] feat: Add RPC logic and heartbeat logic for decommisson #663

Merged
merged 20 commits into from
Mar 2, 2023

Conversation

xianjingfeng
Copy link
Member

What changes were proposed in this pull request?

Add RPC logic and heartbeat logic for decommisson

Why are the changes needed?

Support shuffle server decommission. It is a part of #80

Does this PR introduce any user-facing change?

No.

How was this patch tested?

UT

# Conflicts:
#	coordinator/src/main/java/org/apache/uniffle/coordinator/SimpleClusterManager.java
# Conflicts:
#	common/src/main/java/org/apache/uniffle/common/ServerStatus.java
#	common/src/main/java/org/apache/uniffle/common/exception/InvalidRequestException.java
#	coordinator/src/main/java/org/apache/uniffle/coordinator/CoordinatorServer.java
#	server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
#	server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
@xianjingfeng xianjingfeng requested review from advancedxy, zuston, jerqi and kaijchen and removed request for advancedxy and zuston February 27, 2023 07:04
@codecov-commenter
Copy link

codecov-commenter commented Feb 28, 2023

Codecov Report

Merging #663 (caee94c) into master (c70d154) will increase coverage by 2.34%.
The diff coverage is 37.87%.

@@             Coverage Diff              @@
##             master     #663      +/-   ##
============================================
+ Coverage     60.67%   63.02%   +2.34%     
- Complexity     1802     1836      +34     
============================================
  Files           216      207       -9     
  Lines         12458    10677    -1781     
  Branches       1052     1067      +15     
============================================
- Hits           7559     6729     -830     
+ Misses         4494     3600     -894     
+ Partials        405      348      -57     
Impacted Files Coverage Δ
...java/org/apache/uniffle/common/rpc/GrpcServer.java 21.53% <0.00%> (-3.92%) ⬇️
...he/uniffle/coordinator/CoordinatorGrpcService.java 2.07% <0.00%> (-0.02%) ⬇️
...a/org/apache/uniffle/server/RegisterHeartBeat.java 43.10% <0.00%> (-0.76%) ⬇️
...iffle/server/ShuffleServerInternalGrpcService.java 8.57% <8.57%> (ø)
...ache/uniffle/coordinator/SimpleClusterManager.java 75.31% <33.33%> (-7.52%) ⬇️
...ava/org/apache/uniffle/coordinator/ServerNode.java 81.25% <50.00%> (-4.80%) ⬇️
...n/java/org/apache/uniffle/common/ServerStatus.java 93.75% <88.88%> (+93.75%) ⬆️
...java/org/apache/uniffle/common/rpc/StatusCode.java 95.65% <88.88%> (+1.90%) ⬆️
...rg/apache/uniffle/coordinator/CoordinatorConf.java 97.72% <100.00%> (+0.13%) ⬆️
...apache/uniffle/coordinator/CoordinatorFactory.java 84.61% <100.00%> (+2.79%) ⬆️
... and 30 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

jerqi
jerqi previously approved these changes Mar 1, 2023
Copy link
Contributor

@jerqi jerqi left a comment

Choose a reason for hiding this comment

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

LGTM, wait for GA.

Copy link
Contributor

@advancedxy advancedxy left a comment

Choose a reason for hiding this comment

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

Generally LGTM.

@xianjingfeng xianjingfeng merged commit 1951376 into apache:master Mar 2, 2023
@xianjingfeng
Copy link
Member Author

Thanks @jerqi @advancedxy

@xianjingfeng xianjingfeng deleted the issue_80_part2 branch March 2, 2023 13:29
for (StatusCode statusCode : statusCodes) {
try {
RssProtos.StatusCode.valueOf(statusCode.name());
} catch (Exception e) {
fail(e.getMessage());
}
}
for (int i = 0; i < statusCodes.length; i++) {
assertEquals(protoStatusCode[i], statusCodes[i].toProto());
for (int i = 0; i < statusCodes.size() - 1; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be restored to the original code since UNKNOWN has already been filtered out.

Copy link
Member Author

Choose a reason for hiding this comment

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

Get. I will fix it in next pr of this feature.

fail(e.getMessage());
}
}
for (int i = 0; i < serverStatuses.size() - 1; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto.. You may open a follow up pr for this.

advancedxy pushed a commit to advancedxy/incubator-uniffle that referenced this pull request Mar 21, 2023
…misson (apache#663)

Add RPC logic and heartbeat logic for decommisson

Support shuffle server decommission. It is a part of apache#80

No.

UT
xianjingfeng added a commit to xianjingfeng/incubator-uniffle that referenced this pull request Apr 5, 2023
…misson (apache#663)

### What changes were proposed in this pull request?
Add RPC logic and heartbeat logic for decommisson

### Why are the changes needed?
Support shuffle server decommission. It is a part of apache#80

### Does this PR introduce any user-facing change?
No.

### How was this patch tested?
UT
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.

4 participants