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

[MINOR] fix(spark-client): Fix fallback to sort fail issue #2329

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

maobaolong
Copy link
Member

What changes were proposed in this pull request?

Fix fallback to sort fail issue

Why are the changes needed?

Support fallback to sort shuffle service.

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Existing UTs.

@codecov-commenter
Copy link

codecov-commenter commented Jan 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.01%. Comparing base (580b4f2) to head (35efc11).
Report is 10 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #2329      +/-   ##
============================================
+ Coverage     51.19%   52.01%   +0.81%     
- Complexity     2936     2938       +2     
============================================
  Files           486      465      -21     
  Lines         24720    22181    -2539     
  Branches       2041     2041              
============================================
- Hits          12656    11537    -1119     
+ Misses        11274     9928    -1346     
+ Partials        790      716      -74     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

github-actions bot commented Jan 5, 2025

Test Results

 2 966 files  ±0   2 966 suites  ±0   6h 27m 3s ⏱️ -15s
 1 100 tests ±0   1 098 ✅ ±0   2 💤 ±0  0 ❌ ±0 
13 774 runs  ±0  13 744 ✅ ±0  30 💤 ±0  0 ❌ ±0 

Results for commit 35efc11. ± Comparison against base commit 3b0521a.

♻️ This comment has been updated with latest results.

@maobaolong maobaolong closed this Jan 5, 2025
@maobaolong maobaolong reopened this Jan 5, 2025
@@ -104,6 +104,7 @@ private ShuffleManager createShuffleManagerInDriver() throws RssException {
Constants.SORT_SHUFFLE_MANAGER_NAME, sparkConf, true);
sparkConf.set(RssSparkConfig.RSS_ENABLED.key(), "false");
sparkConf.set("spark.shuffle.manager", "sort");
sparkConf.set("spark.shuffle.service.enabled", "true");
Copy link
Contributor

Choose a reason for hiding this comment

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

If the user doesn't enable external shuffle, this config option shouldn't be true.

Copy link
Member Author

Choose a reason for hiding this comment

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

But if it is false, sort shuffle manager cannot work

Copy link
Contributor

@jerqi jerqi Jan 6, 2025

Choose a reason for hiding this comment

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

Sort shuffle manager can work without external shuffle.

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.

@maobaolong maobaolong merged commit c14bff7 into apache:master Jan 7, 2025
43 checks passed
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.

3 participants