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

[#632]fix: respect volumes in rss spec #634

Merged
merged 3 commits into from
Feb 21, 2023
Merged

Conversation

advancedxy
Copy link
Contributor

What changes were proposed in this pull request?

respect volumes for rss coordinator and shuffle server

Why are the changes needed?

This is a bug fix
Fix: #632

Does this PR introduce any user-facing change?

Admin of rss cluster could specify the volumes which could be used to configure
hadoop conf for example

How was this patch tested?

Added UTs.

@advancedxy
Copy link
Contributor Author

This is bug fix, and it should also be included in branch-0.7. 😢 😭 cc @zuston
I will cherry-pick this pr once merged.

@codecov-commenter
Copy link

codecov-commenter commented Feb 20, 2023

Codecov Report

Merging #634 (0779052) into master (350aa5a) will decrease coverage by 0.83%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master     #634      +/-   ##
============================================
- Coverage     61.72%   60.90%   -0.83%     
- Complexity     1666     1799     +133     
============================================
  Files           201      214      +13     
  Lines         11105    12381    +1276     
  Branches        920     1042     +122     
============================================
+ Hits           6855     7541     +686     
- Misses         3876     4437     +561     
- Partials        374      403      +29     
Impacted Files Coverage Δ
...tor/pkg/controller/sync/coordinator/coordinator.go 97.87% <100.00%> (ø)
...pkg/controller/sync/shuffleserver/shuffleserver.go 85.78% <100.00%> (ø)
.../hadoop/mapreduce/task/reduce/RssEventFetcher.java 88.57% <0.00%> (ø)
...java/org/apache/hadoop/mapred/SortWriteBuffer.java 90.90% <0.00%> (ø)
.../hadoop/mapreduce/task/reduce/RssBypassWriter.java 61.90% <0.00%> (ø)
...preduce/task/reduce/RssRemoteMergeManagerImpl.java 82.43% <0.00%> (ø)
...apache/hadoop/mapreduce/v2/app/RssMRAppMaster.java 0.00% <0.00%> (ø)
...pache/hadoop/mapreduce/task/reduce/RssShuffle.java 0.00% <0.00%> (ø)
...pache/hadoop/mapreduce/task/reduce/RssFetcher.java 92.30% <0.00%> (ø)
...mapreduce/task/reduce/RssInMemoryRemoteMerger.java 75.94% <0.00%> (ø)
... and 6 more

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

@advancedxy
Copy link
Contributor Author

Hi, @wangao1236 @jerqi please take a look.

@jerqi
Copy link
Contributor

jerqi commented Feb 21, 2023

Is it duplicated with this pr? #466

@advancedxy
Copy link
Contributor Author

Is it duplicated with this pr? #466

No. They are two different issues. This is a bug fix.

IsValidSts: func(sts *appsv1.StatefulSet, rss *uniffleapi.RemoteShuffleService) (valid bool, err error) {
for _, volume := range sts.Spec.Template.Spec.Volumes {
if volume.Name == testVolumeName {
return true, nil
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe we can compare the contents of your custom volume by deepcopy method?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

addressed. Please take a look again

@jerqi jerqi merged commit c45c187 into apache:master Feb 21, 2023
jerqi pushed a commit that referenced this pull request Feb 21, 2023
### What changes were proposed in this pull request?
respect volumes for rss coordinator and shuffle server

### Why are the changes needed?
This is a bug fix
Fix: #632

### Does this PR introduce _any_ user-facing change?
Admin of rss cluster could specify the volumes which could be used to configure 
hadoop conf for example
### How was this patch tested?
Added UTs.
@jerqi
Copy link
Contributor

jerqi commented Feb 21, 2023

merged master & branch-0.7

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] rss spec's volume doesn't take an effect
4 participants