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.

Sign up for GitHub

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

Jump to bottom

[SPARK-3216] [SPARK-3232] Spark-shell is broken in branch-1.0 / Backport SPARK-3006 into branch-1.0 #2136

Closed
wants to merge 4 commits into from
Closed

[SPARK-3216] [SPARK-3232] Spark-shell is broken in branch-1.0 / Backport SPARK-3006 into branch-1.0 #2136

wants to merge 4 commits into from

Conversation

sarutak
Copy link
Member

@sarutak sarutak commented Aug 26, 2014

No description provided.

@sarutak
Copy link
Member Author

sarutak commented Aug 26, 2014

Jenkins, test this please.

@sarutak
Copy link
Member Author

sarutak commented Aug 26, 2014

@andrewor14 I also tried but couldn't let Jenkins work...

andrewor14
andrewor14 reviewed Aug 26, 2014
View reviewed changes
bin/spark-shell.cmd
@@ -19,4 +19,4 @@ rem

set SPARK_HOME=%~dp0..

cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd spark-shell %* --class org.apache.spark.repl.Main
cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd --class org.apache.spark.repl.Main spark-shell %*
Copy link
Contributor

Choose a reason for hiding this comment

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

This won't actually work. You need to put the %* before spark-shell

@andrewor14
Copy link
Contributor

@sarutak Good catch on including #1918 as well. I will close my PR in favor of this.

@andrewor14 andrewor14 mentioned this pull request Aug 26, 2014
Closed
@pwendell
Copy link
Contributor

Jenkins, test this please.

@sarutak
Copy link
Member Author

sarutak commented Aug 27, 2014

Test would not start...

/CC @andrewor14 @pwendell

@JoshRosen
Copy link
Contributor

Jenkins, retest this please.

@sarutak
Copy link
Member Author

sarutak commented Sep 2, 2014

Jenkins, retest this please.

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

Jenkins, retest this please

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

Does anybody know why Jenkins won't pick this up ? Its annoying that we can't use spark-shell from branch-1.0

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

I figured out why Jenkins doesn't work. It looks for dev/run-tests-jenkins which isn't there in branch-1.0
@pwendell any ideas on how we can test back ports to branch-1.0 ?

@andrewor14
Copy link
Contributor

@pwendell just fixed it on our side. Now it goes and fetches dev/run-tests-jenkins if it doesn't exist.

Jenkins, test this please.

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

Jenkins, retest this please

@SparkQA
Copy link

SparkQA commented Sep 3, 2014

QA tests have started for PR 2136 at commit 5c20d2d.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Sep 3, 2014

QA tests have finished for PR 2136 at commit 5c20d2d.

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

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

@andrewor14 Is this good to merge ? Or are there any comments that haven't been addressed ?

@andrewor14
Copy link
Contributor

Yeah but I'll just fix it up myself. Thanks @sarutak I've merged this. Mind closing this issue? @asfgit won't do it for some reason.

@shivaram
Copy link
Contributor

shivaram commented Sep 3, 2014

Thanks @andrewor14 !

asfgit pushed a commit that referenced this pull request Sep 3, 2014
@sarutak @andrewor14
[SPARK-3216] [SPARK-3232] Spark-shell is broken in branch-1.0 / Backp…
8dd7690 
…ort SPARK-3006 into branch-1.0

Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Author: Andrew Or <andrewor14@gmail.com>

Closes #2136 from sarutak/SPARK-3216 and squashes the following commits:

5c20d2d [Kousuke Saruta] Merge branch 'branch-1.0' of git://git.apache.org/spark into SPARK-3216
af0517f [Kousuke Saruta] Modified spark-shell.cmd, backporting SPARK-3006
bbc7221 [Kousuke Saruta] Replace 4-space into 2-space
15cd980 [Andrew Or] Fix spark-shell in branch-1.0
@JoshRosen
Copy link
Contributor

GitHub won't close pull requests from commit messages unless those commits are merged into master.

@sarutak
Copy link
Member Author

sarutak commented Sep 4, 2014

May I close this PR manually?

@JoshRosen
Copy link
Contributor

Yes, please go ahead and close it, now that Andrew has merged your patch. Thanks!

@sarutak sarutak closed this Sep 4, 2014
@sarutak sarutak deleted the SPARK-3216 branch April 11, 2015 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@sarutak @andrewor14 @pwendell @JoshRosen @shivaram @SparkQA