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

Prepare Spark release v3.0.0-preview-rc1 #26243

Closed
wants to merge 3 commits into from

Conversation

jiangxb1987
Copy link
Contributor

@jiangxb1987 jiangxb1987 commented Oct 24, 2019

What changes were proposed in this pull request?

To push the built jars to maven release repository, we need to remove the 'SNAPSHOT' tag from the version name.

Made the following changes in this PR:

  • Update all the 3.0.0-SNAPSHOT version name to 3.0.0-preview
  • Update the PySpark version from 3.0.0.dev0 to 3.0.0

Please note those changes were generated by the release script in the past, but this time since we manually add tags on master branch, we need to manually apply those changes too.

We shall revert the changes after 3.0.0-preview release passed.

Why are the changes needed?

To make the maven release repository to accept the built jars.

Does this PR introduce any user-facing change?

No

How was this patch tested?

N/A

@jiangxb1987
Copy link
Contributor Author

@srowen
Copy link
Member

srowen commented Oct 24, 2019

Right, seems like we'd have to do this for release and then revert. OK

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112604 has finished for PR 26243 at commit 3db7b71.

  • This patch fails PySpark pip packaging tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112606 has finished for PR 26243 at commit ed65ac5.

  • This patch fails PySpark pip packaging tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112607 has finished for PR 26243 at commit 8ac854b.

  • This patch fails PySpark pip packaging tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@dongjoon-hyun
Copy link
Member

Hi, @jiangxb1987 . We need to update R/pkg/DESCRIPTION, too.
cc @shivaram , @felixcheung , @HyukjinKwon

@dongjoon-hyun
Copy link
Member

Also, this should be reverted this immediately after commit. Otherwise, our Jenkins will try to publish this to our snapshot repository.

@dongjoon-hyun dongjoon-hyun changed the title [MINOR] Prepare Spark release 3.0.0-preview Prepare Spark release v3.0.0-preview-rc1 Oct 24, 2019
@dongjoon-hyun
Copy link
Member

dongjoon-hyun commented Oct 24, 2019

Hi, @jiangxb1987 . I update the PR title for a commit log. Since we use Preparing Spark release v2.4.4-rc3, the following will be the better. (Also removed the [MINOR] prefix)

Prepare Spark release v3.0.0-preview-rc1

docs/_config.yml Outdated
@@ -14,7 +14,7 @@ include:

# These allow the documentation to be updated with newer releases
# of Spark, Scala, and Mesos.
SPARK_VERSION: 3.0.0-SNAPSHOT
SPARK_VERSION: 3.0.0-preview
SPARK_VERSION_SHORT: 3.0.0
Copy link
Member

Choose a reason for hiding this comment

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

This also should be 3.0.0-preview. The whole string of 3.0.0-preview is the short version.

@dongjoon-hyun
Copy link
Member

Also, could you review this, @gatorsmile ?

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112609 has finished for PR 26243 at commit 322fcab.

  • This patch fails SparkR unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@dongjoon-hyun
Copy link
Member

The R failure is due to this.

Error in sparkR.session(master = sparkRTestMaster, enableHiveSupport = FALSE) : 
  (converted from warning) Version mismatch between Spark JVM and SparkR package. JVM version was 3.0.0-preview , while R package version was 3.0.0

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112614 has finished for PR 26243 at commit ebc2345.

  • This patch fails some tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Oct 24, 2019

Test build #112616 has started for PR 26243 at commit f3731db.

R/pkg/DESCRIPTION Outdated Show resolved Hide resolved
Copy link
Member

@HyukjinKwon HyukjinKwon left a comment

Choose a reason for hiding this comment

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

BTW, shouldn't we cut the branch first and land this change to that branch?

@srowen
Copy link
Member

srowen commented Oct 25, 2019

Ideally yes we release Pyspark and SparkR. At least, Pyspark seems pretty important.

If it's a major problem that we're trying to do this in master, then I concede, let's make a branch. Does a name like "3.0.0.preview" cause fewer headaches? we do have to keep the branch if that's what we release, but, if we have to do it we have to.

If the idea is to go ahead and cut branch-3.0, I'd rather not just because of the headache of merging back every change from now until 3.0. But it's not out of the question.

@HyukjinKwon
Copy link
Member

Ah, yea, I meant the branch like branch-3.0-preview or preview-3.0 for instance.

Does a name like "3.0.0.preview" cause fewer headaches?

If this works, yea it should be good. Let us know @jiangxb1987 :D.

@shivaram
Copy link
Contributor

I don't think we should release the SparkR preview on CRAN. We can't overwrite versions and the default install from CRAN gives the latest version.

@felixcheung
Copy link
Member

felixcheung commented Oct 25, 2019 via email

@dongjoon-hyun
Copy link
Member

Thank you all.

  1. For SparkR, if we are going to skip CRAN, the problem is solved.
  2. For PySpark, the branch was already created as branch-3.0-preview and deleted before due to the side effect (@HyukjinKwon . Please see the mailing list. We discussed the side-effect on dev mailing list).
    If there is a way to avoid the side-effect on our merge script and release script. I'm also okay for re-creating.

Please check the feasibility before creating the branch. Maybe, it seems to depend on the branch naming.

@HyukjinKwon
Copy link
Member

retest this please

@HyukjinKwon
Copy link
Member

Thanks for pointer @dongjoon-hyun. Alright, then, we don't do PyPI too I guess @holdenk?

/tmp/tmp.RRgnNxjsCA/3.5/lib/python3.5/site-packages/setuptools/dist.py:398: UserWarning: Normalizing '3.0.0.preview' to '3.0.0rc0'
......
Requirement '/home/jenkins/workspace/SparkPullRequestBuilder@2/python/dist/pyspark-3.0.0.preview.tar.gz' looks like a filename, but the file does not exist
Processing ./python/dist/pyspark-3.0.0.preview.tar.gz
Could not install packages due to an EnvironmentError: [Errno 2] No such file or directory: '/home/jenkins/workspace/SparkPullRequestBuilder@2/python/dist/pyspark-3.0.0.preview.tar.gz'

This looks just pip packaging test failure. setup.py is only for PIP packaging and we don't probably need it.

Can we just completely skip pip packaging or use some workarounds to disable the normalizing the name (pypa/setuptools#308) for this preview?

@HyukjinKwon
Copy link
Member

HyukjinKwon commented Oct 25, 2019

If ^ is easy, and can be done in this PR, without a separate branch, 1. we can check if the tests pass 2. we release preview and 3. revert this commit from the master.

Sorry if this was discussed already somewhere but we're not going to vote on it and make multiple RCs right (since it's just a preview)?

It we're going to vote and make more RCs for preview, it might be best to have a separate branch. Seems like merging script issue can be easily fixed in this case. The latest branch is decided by sorting order so we can name it like branch-preview-3.0. JIRA fixed version we will have to fix this line

branch_ver = branch.replace("branch-", "")

@SparkQA
Copy link

SparkQA commented Oct 25, 2019

Test build #112649 has finished for PR 26243 at commit f3731db.

  • This patch fails due to an unknown error code, -9.
  • This patch merges cleanly.
  • This patch adds no public classes.

Copy link
Member

@HyukjinKwon HyukjinKwon left a comment

Choose a reason for hiding this comment

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

LGTM pending Jenkins.

@SparkQA
Copy link

SparkQA commented Oct 28, 2019

Test build #112754 has finished for PR 26243 at commit 6459efe.

  • This patch fails due to an unknown error code, -9.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member

retest this please

@SparkQA
Copy link

SparkQA commented Oct 28, 2019

Test build #112761 has finished for PR 26243 at commit 6459efe.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member

I reverted 5fc363b which I merged by myself ... seems it causes the build failure on Windows (#26278). Let me rebase it here.

@SparkQA
Copy link

SparkQA commented Oct 28, 2019

Test build #112770 has finished for PR 26243 at commit 6a59acd.

  • This patch fails build dependency tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member

retest this please

@SparkQA
Copy link

SparkQA commented Oct 28, 2019

Test build #112772 has started for PR 26243 at commit 6a59acd.

@dongjoon-hyun
Copy link
Member

Got it. Thank you for reverting and keeping this moving forward! @HyukjinKwon .

@SparkQA
Copy link

SparkQA commented Oct 29, 2019

Test build #112806 has finished for PR 26243 at commit ec571bb.

  • This patch fails build dependency tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member

retest this please

@SparkQA
Copy link

SparkQA commented Oct 29, 2019

Test build #112808 has finished for PR 26243 at commit ec571bb.

  • This patch fails build dependency tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Oct 29, 2019

Test build #112809 has finished for PR 26243 at commit e1808a5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member

should be good to go.

@cloud-fan
Copy link
Contributor

LGTM

@jiangxb1987
Copy link
Contributor Author

Thanks, merging to master!

@jiangxb1987
Copy link
Contributor Author

FYI, this PR has been reverted by b33a58c

@dongjoon-hyun
Copy link
Member

Great! Thank you all!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants