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

Keep Spark version in a single place only (BeamModulePlugin) #23603

Merged
merged 1 commit into from
Oct 19, 2022

Conversation

mosche
Copy link
Member

@mosche mosche commented Oct 12, 2022

It's a bit of a trap to have the Spark version in two places.

Especially because it's most obvious to change the one in the Spark build.gradle. But that one is always overruled by the one used in the artifact library in BeamModulePlugin.


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI.

@mosche
Copy link
Member Author

mosche commented Oct 12, 2022

R: @aromanenko-dev

@codecov
Copy link

codecov bot commented Oct 12, 2022

Codecov Report

Merging #23603 (7b6cc89) into master (1c1ecb2) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #23603   +/-   ##
=======================================
  Coverage   73.33%   73.33%           
=======================================
  Files         719      719           
  Lines       95792    95792           
=======================================
  Hits        70250    70250           
  Misses      24231    24231           
  Partials     1311     1311           
Flag Coverage Δ
python 83.05% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...eam/runners/portability/fn_api_runner/execution.py 92.44% <0.00%> (-0.65%) ⬇️
...ks/python/apache_beam/runners/worker/sdk_worker.py 89.24% <0.00%> (+0.16%) ⬆️
sdks/python/apache_beam/runners/direct/executor.py 97.01% <0.00%> (+0.54%) ⬆️
...hon/apache_beam/runners/direct/test_stream_impl.py 94.02% <0.00%> (+0.74%) ⬆️

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

@github-actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@aromanenko-dev
Copy link
Contributor

Retest this please

@aromanenko-dev
Copy link
Contributor

Run Spark StructuredStreaming ValidatesRunner

@aromanenko-dev
Copy link
Contributor

Run Spark ValidatesRunner

@aromanenko-dev
Copy link
Contributor

Run Java_Debezium_IO_Direct PreCommit

@aromanenko-dev
Copy link
Contributor

Run Portable_Python PreCommit

Copy link
Contributor

@aromanenko-dev aromanenko-dev left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM. Just a couple of notes.

@@ -499,6 +499,10 @@ class BeamModulePlugin implements Plugin<Project> {
def arrow_version = "5.0.0"
def jmh_version = "1.34"

// Export Spark versions, so they are defined in a single place only
project.ext.spark2_version = spark2_version
Copy link
Contributor

@aromanenko-dev aromanenko-dev Oct 18, 2022

Choose a reason for hiding this comment

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

nit: It'd be worth to mention that spark 2 is deprecated in Beam

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll add some comments as part of #23728

// Set the version of all Spark-related dependencies here.
spark_version = '2.4.8'
// Spark 2 version as defined in BeamModulePlugin
spark_version = spark2_version
Copy link
Contributor

Choose a reason for hiding this comment

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

As a side note - it's ambiguous to have two types of the naming style (underscore and camel case) in the same config file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Not going to fix all inconsistencies at once ;)

@aromanenko-dev aromanenko-dev merged commit 1179fdc into apache:master Oct 19, 2022
@mosche mosche deleted the adhoc_dry_spark_version branch November 9, 2022 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants