Skip to content

[SPARK-1403] Move the class loader creation back to where it was in 0.9.0 #322

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

Closed
ghost wants to merge 11 commits into from
Closed

[SPARK-1403] Move the class loader creation back to where it was in 0.9.0 #322

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89109d7
move the class loader creation back to where it was in 0.9.0
Apr 4, 2014
42d3d6a
used code fragment from @ueshin to fix the problem in a better way
Apr 4, 2014
f3c9a14
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 4, 2014
4803c19
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 4, 2014
04b9662
add missing line
Apr 5, 2014
b3a053f
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 5, 2014
6f260a4
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 5, 2014
044027d
fix compile error
Apr 5, 2014
728beca
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 5, 2014
ec8f870
revert the logger change for java 6 compatibility as PR 334 is doing it
Apr 6, 2014
606c2b9
Merge remote-tracking branch 'upstream/master' into spark-1403
Apr 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions core/src/main/scala/org/apache/spark/executor/MesosExecutorBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,19 @@ private[spark] class MesosExecutorBackend
executorInfo: ExecutorInfo,
frameworkInfo: FrameworkInfo,
slaveInfo: SlaveInfo) {
logInfo("Registered with Mesos as executor ID " + executorInfo.getExecutorId.getValue)
this.driver = driver
val properties = Utils.deserialize[Array[(String, String)]](executorInfo.getData.toByteArray)
executor = new Executor(
executorInfo.getExecutorId.getValue,
slaveInfo.getHostname,
properties)
val cl = Thread.currentThread.getContextClassLoader
try {
Copy link
Member

@ueshin ueshin Apr 5, 2014

Choose a reason for hiding this comment

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

You need one more line here

Thread.currentThread.setContextClassLoader(getClass.getClassLoader)

Thread.currentThread.setContextClassLoader(getClass.getClassLoader)
logInfo("Registered with Mesos as executor ID " + executorInfo.getExecutorId.getValue)
this.driver = driver
val properties = Utils.deserialize[Array[(String, String)]](executorInfo.getData.toByteArray)
executor = new Executor(
executorInfo.getExecutorId.getValue,
slaveInfo.getHostname,
properties)
} finally {
Thread.currentThread.setContextClassLoader(cl)
}
}

override def launchTask(d: ExecutorDriver, taskInfo: TaskInfo) {
Expand Down