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

[#647] fix: Multiple coordinator produce conflicts when they delect the same file #648

Merged
merged 6 commits into from
Feb 23, 2023

Conversation

jerqi
Copy link
Contributor

@jerqi jerqi commented Feb 22, 2023

What changes were proposed in this pull request?

Add coordinator's id to the file which Coordinator delect.

Why are the changes needed?

Fix #647

Does this PR introduce any user-facing change?

No.

How was this patch tested?

UT

@codecov-commenter
Copy link

codecov-commenter commented Feb 22, 2023

Codecov Report

Merging #648 (359644d) into master (c45c187) will increase coverage by 2.00%.
The diff coverage is 100.00%.

❗ Current head 359644d differs from pull request most recent head 0d5b316. Consider uploading reports for the commit 0d5b316 to get more accurate results

@@             Coverage Diff              @@
##             master     #648      +/-   ##
============================================
+ Coverage     60.89%   62.90%   +2.00%     
- Complexity     1798     1801       +3     
============================================
  Files           214      202      -12     
  Lines         12381    10496    -1885     
  Branches       1042     1052      +10     
============================================
- Hits           7539     6602     -937     
+ Misses         4438     3547     -891     
+ Partials        404      347      -57     
Impacted Files Coverage Δ
...che/uniffle/coordinator/util/CoordinatorUtils.java 72.00% <ø> (ø)
.../apache/uniffle/coordinator/CoordinatorServer.java 57.37% <100.00%> (+0.35%) ⬆️
...ategy/storage/AppBalanceSelectStorageStrategy.java 73.07% <100.00%> (+1.07%) ⬆️
...orage/LowestIOSampleCostSelectStorageStrategy.java 71.92% <100.00%> (+1.02%) ⬆️
...a/org/apache/uniffle/server/RegisterHeartBeat.java 43.85% <0.00%> (-43.86%) ⬇️
.../java/org/apache/uniffle/server/ShuffleServer.java 62.06% <0.00%> (-2.32%) ⬇️
...he/uniffle/server/buffer/ShuffleBufferManager.java 82.74% <0.00%> (-0.36%) ⬇️
.../java/org/apache/uniffle/common/util/RssUtils.java 59.31% <0.00%> (ø)
.../org/apache/uniffle/common/config/ConfigUtils.java 95.55% <0.00%> (ø)
...rg/apache/uniffle/common/config/ConfigOptions.java 96.61% <0.00%> (ø)
... and 19 more

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

@jerqi jerqi changed the title [#647] fix: Multiple coordinator delect the same file [#647] fix: Multiple coordinator produce conflicts when they delect the same file Feb 22, 2023
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.

Left two minor comments

@jerqi
Copy link
Contributor Author

jerqi commented Feb 22, 2023

addressed comments.

@advancedxy advancedxy merged commit d1a3bd1 into apache:master Feb 23, 2023
@advancedxy
Copy link
Contributor

Thanks, merged this into master

@jerqi
Copy link
Contributor Author

jerqi commented Feb 23, 2023

This is a fix, I will merge this pr to branch-0.7, too. cc @zuston

jerqi added a commit that referenced this pull request Feb 23, 2023
…he same file (#648)

### What changes were proposed in this pull request?
Add coordinator's id to the file which Coordinator delect.

### Why are the changes needed?
Fix #647

### 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.

[Bug] Multiple Coordinator call method detectStorage
3 participants