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] improvement: Reduce the size of Spark patch #699

Merged
merged 3 commits into from
Mar 9, 2023

Conversation

jerqi
Copy link
Contributor

@jerqi jerqi commented Mar 9, 2023

What changes were proposed in this pull request?

As apache/spark#40307 (comment), we could use spark.shuffle.reduceLocality.enabled to reduce the modification of the Apache Spark.

Why are the changes needed?

Reduce the spark patch size

Does this PR introduce any user-facing change?

No.

How was this patch tested?

No need

@jerqi jerqi requested a review from zuston March 9, 2023 02:40
@codecov-commenter
Copy link

codecov-commenter commented Mar 9, 2023

Codecov Report

Merging #699 (15044b3) into master (ffa50b9) will increase coverage by 2.26%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master     #699      +/-   ##
============================================
+ Coverage     60.80%   63.06%   +2.26%     
- Complexity     1840     1841       +1     
============================================
  Files           221      207      -14     
  Lines         12648    10683    -1965     
  Branches       1062     1062              
============================================
- Hits           7690     6737     -953     
+ Misses         4552     3601     -951     
+ Partials        406      345      -61     
Impacted Files Coverage Δ
...g/apache/uniffle/common/compression/ZstdCodec.java 70.58% <0.00%> (-1.64%) ⬇️
...le/storage/common/DefaultStorageMediaProvider.java 60.60% <0.00%> (ø)
deploy/kubernetes/operator/pkg/utils/util.go
...pkg/controller/sync/shuffleserver/shuffleserver.go
...y/kubernetes/operator/pkg/webhook/inspector/rss.go
...tor/pkg/controller/sync/coordinator/coordinator.go
...y/kubernetes/operator/pkg/webhook/inspector/pod.go
...rnetes/operator/pkg/webhook/inspector/inspector.go
...bernetes/operator/pkg/controller/controller/rss.go
deploy/kubernetes/operator/pkg/webhook/manager.go
... and 7 more

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

@@ -188,6 +188,8 @@ public RssShuffleManager(SparkConf sparkConf, boolean isDriver) {
// External shuffle service is not supported when using remote shuffle service
sparkConf.set("spark.shuffle.service.enabled", "false");
LOG.info("Disable external shuffle service in RssShuffleManager.");
sparkConf.set("spark.shuffle.reduceLocality.enabled", "false");
Copy link
Member

Choose a reason for hiding this comment

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

#341 need this feature.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because our data is in the RSS cluster or HDFS, locatity is useless for us. If rack aware need this feature, we can turn on this feature when we use rack aware.

Copy link
Member

Choose a reason for hiding this comment

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

+1. The locality awareness could be supported in the future.

@@ -188,6 +188,8 @@ public RssShuffleManager(SparkConf sparkConf, boolean isDriver) {
// External shuffle service is not supported when using remote shuffle service
sparkConf.set("spark.shuffle.service.enabled", "false");
LOG.info("Disable external shuffle service in RssShuffleManager.");
sparkConf.set("spark.shuffle.reduceLocality.enabled", "false");
Copy link
Contributor

Choose a reason for hiding this comment

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

Would you mind add a comment here, like L188.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

@@ -205,6 +205,8 @@ public RssShuffleManager(SparkConf conf, boolean isDriver) {
LOG.info("Disable external shuffle service in RssShuffleManager.");
sparkConf.set("spark.sql.adaptive.localShuffleReader.enabled", "false");
LOG.info("Disable local shuffle reader in RssShuffleManager.");
sparkConf.set("spark.shuffle.reduceLocality.enabled", "false");
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

advancedxy
advancedxy previously approved these changes Mar 9, 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.

LGTM, except two minor comments.

Copy link
Member

@zuston zuston left a comment

Choose a reason for hiding this comment

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

LGTM.

@jerqi jerqi merged commit af21f0d into apache:master Mar 9, 2023
advancedxy pushed a commit to advancedxy/incubator-uniffle that referenced this pull request Mar 21, 2023
### What changes were proposed in this pull request?
As apache/spark#40307 (comment), we could use `spark.shuffle.reduceLocality.enabled` to reduce the modification of the Apache Spark.

### Why are the changes needed?

Reduce the spark patch size

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?
No need

Co-authored-by: roryqi <roryqi@tencent.com>
xianjingfeng pushed a commit to xianjingfeng/incubator-uniffle that referenced this pull request Apr 5, 2023
### What changes were proposed in this pull request?
As apache/spark#40307 (comment), we could use `spark.shuffle.reduceLocality.enabled` to reduce the modification of the Apache Spark.

### Why are the changes needed?

Reduce the spark patch size

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?
No need

Co-authored-by: roryqi <roryqi@tencent.com>
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