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

[SPARK-19464][BUILD][HOTFIX] run-tests should use hadoop2.6 #16858

Closed
wants to merge 3 commits into from
Closed

[SPARK-19464][BUILD][HOTFIX] run-tests should use hadoop2.6 #16858

wants to merge 3 commits into from

Conversation

dongjoon-hyun
Copy link
Member

@dongjoon-hyun dongjoon-hyun commented Feb 8, 2017

What changes were proposed in this pull request?

After SPARK-19464, SparkPullRequestBuilder fails because it still tries to use hadoop2.3.

BEFORE
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/72595/console

========================================================================
Building Spark
========================================================================
[error] Could not find hadoop2.3 in the list. Valid options  are ['hadoop2.6', 'hadoop2.7']
Attempting to post to Github...
 > Post successful.

AFTER
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/72595/console

========================================================================
Building Spark
========================================================================
[info] Building Spark (w/Hive 1.2.1) using SBT with these arguments:  -Phadoop-2.6 -Pmesos -Pkinesis-asl -Pyarn -Phive-thriftserver -Phive test:package streaming-kafka-0-8-assembly/assembly streaming-flume-assembly/assembly streaming-kinesis-asl-assembly/assembly
Using /usr/java/jdk1.8.0_60 as default JAVA_HOME.
Note, this will be overridden by -java-home if it is set.

How was this patch tested?

Pass the existing test.

@dongjoon-hyun
Copy link
Member Author

@srowen Could you review this?

@@ -165,12 +165,6 @@ def main():
if "test-maven" in ghprb_pull_title:
os.environ["AMPLAB_JENKINS_BUILD_TOOL"] = "maven"
# Switch the Hadoop profile based on the PR title:
Copy link
Member Author

Choose a reason for hiding this comment

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

This removes hadoop 2.5 and earlier, too.

Copy link
Member

Choose a reason for hiding this comment

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

Ah... right missed this. This part doesn't actually matter, but, do the Jenkins jobs not all set a Hadoop version? then yeah could default to hadoop2.3 which doesn't exist

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Feb 8, 2017

Choose a reason for hiding this comment

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

Yep. This is not related to the SparkPullRequestBuilder failures.
SparkPullRequestBuilder failure is due to the other file in this PR.

Copy link
Member

Choose a reason for hiding this comment

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

BTW while you're at it, I spotted one more thing that we could remove although it probably won't matter at all. Look for expect_equal(basenameSansExtFromUrl(y), "spark-2.1.0-bin-hadoop2.4-without-hive") in test_utils.R

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure!

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 fixed that too.

@@ -505,14 +505,14 @@ def main():
# if we're on the Amplab Jenkins build servers setup variables
# to reflect the environment settings
build_tool = os.environ.get("AMPLAB_JENKINS_BUILD_TOOL", "sbt")
hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.3")
Copy link
Member Author

Choose a reason for hiding this comment

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

The default value should be 2.6.

test_env = "amplab_jenkins"
# add path for Python3 in Jenkins if we're calling from a Jenkins machine
os.environ["PATH"] = "/home/anaconda/envs/py3k/bin:" + os.environ.get("PATH")
else:
# else we're running locally and can use local settings
build_tool = "sbt"
hadoop_version = os.environ.get("HADOOP_PROFILE", "hadoop2.3")
Copy link
Member Author

Choose a reason for hiding this comment

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

Here, too.

@@ -232,9 +232,9 @@ test_that("basenameSansExtFromUrl", {
x <- paste0("http://people.apache.org/~pwendell/spark-nightly/spark-branch-2.1-bin/spark-2.1.1-",
"SNAPSHOT-2016_12_09_11_08-eb2d9bf-bin/spark-2.1.1-SNAPSHOT-bin-hadoop2.7.tgz")
y <- paste0("http://people.apache.org/~pwendell/spark-releases/spark-2.1.0-rc2-bin/spark-2.1.0-",
"bin-hadoop2.4-without-hive.tgz")
"bin-hadoop2.6-without-hive.tgz")
Copy link
Member

Choose a reason for hiding this comment

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

Actually there is no such artifact anymore. Just remove this line and the one below that also referenced it

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, I see.

@dongjoon-hyun
Copy link
Member Author

I removed those lines, too.

@dongjoon-hyun
Copy link
Member Author

Thank you for review, @srowen . Also, since it touches R now, cc @felixcheung .

@SparkQA
Copy link

SparkQA commented Feb 8, 2017

Test build #72596 has finished for PR 16858 at commit e9d720e.

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

@dongjoon-hyun
Copy link
Member Author

The only failure is irrelevant to this PR, ad also the very next Jenkins pass the test.

[info] KafkaSourceSuite:
...
[info] - subscribing topic by pattern with topic deletions *** FAILED *** (1 minute, 2 seconds)
[info]   Timed out waiting for stream: The code passed to failAfter did not complete within 30 seconds.

@SparkQA
Copy link

SparkQA commented Feb 8, 2017

Test build #72595 has finished for PR 16858 at commit b8625a2.

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

@srowen
Copy link
Member

srowen commented Feb 8, 2017

OK merging this as it's a fix for the build

@dongjoon-hyun
Copy link
Member Author

dongjoon-hyun commented Feb 8, 2017

Oh, wait a moment please. The Jenkins on the last commit will succeed soon.

@SparkQA
Copy link

SparkQA commented Feb 8, 2017

Test build #72597 has finished for PR 16858 at commit 03f9bfd.

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

@dongjoon-hyun
Copy link
Member Author

Finally, it passed.

@srowen
Copy link
Member

srowen commented Feb 8, 2017

Merged to master

@asfgit asfgit closed this in c618ccd Feb 8, 2017
@dongjoon-hyun
Copy link
Member Author

Thank you for review and merging, @srowen !

@SparkQA
Copy link

SparkQA commented Feb 8, 2017

Test build #3567 has finished for PR 16858 at commit 03f9bfd.

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

@felixcheung
Copy link
Member

felixcheung commented Feb 9, 2017 via email

@srowen
Copy link
Member

srowen commented Feb 9, 2017

This particular URL pattern won't exist anymore, so seems fine to not test it at this point.

@dongjoon-hyun dongjoon-hyun deleted the hotfix_run-tests branch February 10, 2017 16:54
cmonkey pushed a commit to cmonkey/spark that referenced this pull request Feb 15, 2017
## What changes were proposed in this pull request?

After SPARK-19464, **SparkPullRequestBuilder** fails because it still tries to use hadoop2.3.

**BEFORE**
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/72595/console
```
========================================================================
Building Spark
========================================================================
[error] Could not find hadoop2.3 in the list. Valid options  are ['hadoop2.6', 'hadoop2.7']
Attempting to post to Github...
 > Post successful.
```

**AFTER**
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/72595/console
```
========================================================================
Building Spark
========================================================================
[info] Building Spark (w/Hive 1.2.1) using SBT with these arguments:  -Phadoop-2.6 -Pmesos -Pkinesis-asl -Pyarn -Phive-thriftserver -Phive test:package streaming-kafka-0-8-assembly/assembly streaming-flume-assembly/assembly streaming-kinesis-asl-assembly/assembly
Using /usr/java/jdk1.8.0_60 as default JAVA_HOME.
Note, this will be overridden by -java-home if it is set.
```

## How was this patch tested?

Pass the existing test.

Author: Dongjoon Hyun <dongjoon@apache.org>

Closes apache#16858 from dongjoon-hyun/hotfix_run-tests.
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.

4 participants