Skip to content

Conversation

@pdmack
Copy link

@pdmack pdmack commented Jun 30, 2014

Fix for class of test suite failures in jenkins

@srowen
Copy link
Member

srowen commented Jun 30, 2014

I've been wrestling with this dependency for a while. However I thought we specifically wanted to retain servlet-api 3.0. What problem are you seeing? It's possible there's a different answer.

@pdmack
Copy link
Author

pdmack commented Jun 30, 2014

Well, the build seems generally set up for jetty 8 which makes use of servlet-api 3.0.x. So I'm assuming we don't want the old 2.5 one since there are numerous explicit excludes littered through the poms for that version.

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@srowen
Copy link
Member

srowen commented Jun 30, 2014

Yeah, saw your detail on the JIRA. Yes 2.5 should not be in there, I'm just surprised it is. The concern is knocking out 3.0 accidentally. Have you checked that is all OK still? I'll look too just because I've been staring at this particular dependency hell for a while now.

@pdmack
Copy link
Author

pdmack commented Jun 30, 2014

mvn -X -Dhadoop.version=2.0.0-mr1-cdh4.1.2 -Dlabel=centos test

I didn't see any jetty test failures and certainly none of the previous FilterRegistration security exceptions. Also 3.0 remains in tact:

DEBUG] Invalidating /home/pmackinn/.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar: class javax.servlet.http.HttpServletRequest now provided by /home/pmackinn/.m2/repository/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar

@srowen
Copy link
Member

srowen commented Jun 30, 2014

Hey @pdmack as far as I can see, you're correct. javax.servlet:servlet-api is not currently a dependency for most (?) Hadoop versions. It seems to come in with versions of Hadoop 2.0.x via hadoop-hdfs. Excluding it should be fine since it is not desirable where it is brought in, and not brought in elsewhere.

Just check that it all works, that the web UI starts. I have managed to accidentally exclude all copies of the servlet API accidentally before!

@rxin
Copy link
Contributor

rxin commented Jun 30, 2014

Thanks for sending this. Do you mind updating the SBT build file as well (project/SparkBuild.scala)?

@srowen
Copy link
Member

srowen commented Jun 30, 2014

On a very related note, have a look at #906 -- SPARK-1949. It addresses something very similar and I fixed the problem in it vis-a-vis tests.

@pdmack
Copy link
Author

pdmack commented Jul 1, 2014

@rxin, I added requested change to project/SparkBuild.scala

@rxin
Copy link
Contributor

rxin commented Jul 1, 2014

Jenkins, retest this please.

@AmplabJenkins
Copy link

Merged build triggered.

@AmplabJenkins
Copy link

Merged build started.

@AmplabJenkins
Copy link

Merged build finished. All automated tests passed.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/16278/

@rxin
Copy link
Contributor

rxin commented Jul 1, 2014

Thanks. I'm merging this in master.

@asfgit asfgit closed this in 3319a3e Jul 1, 2014
xiliu82 pushed a commit to xiliu82/spark that referenced this pull request Sep 4, 2014
… in core

Fix for class of test suite failures in jenkins

Author: Peter MacKinnon <[email protected]>

Closes apache#1271 from pdmack/master and squashes the following commits:

cfe59fd [Peter MacKinnon] exclude servlet-api in hadoop-client for sbt
6f39fec [Peter MacKinnon] add exclusion for old servlet-api on hadoop-client in core
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