You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/19 20:33:19 UTC
[1/3] git commit: Only log error on missing jar to allow spark
examples to jar.
Updated Branches:
refs/heads/master 256a3553c -> 792d9084e
Only log error on missing jar to allow spark examples to jar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ceb79a39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ceb79a39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ceb79a39
Branch: refs/heads/master
Commit: ceb79a393117d725398e333bddc237613818c333
Parents: fe8a354
Author: Thomas Graves <tg...@apache.org>
Authored: Sun Jan 19 12:16:58 2014 -0600
Committer: Thomas Graves <tg...@apache.org>
Committed: Sun Jan 19 12:16:58 2014 -0600
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ceb79a39/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index ddd7d60..a05d5c5 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -708,8 +708,11 @@ class SparkContext(
env.httpFileServer.addJar(new File(fileName))
} catch {
case e: Exception => {
+ // For now just throw an error but allow to go through so spark examples work.
+ // The spark examples don't really need the jar distributed since its also
+ // the app jar.
logError("Error adding jar (" + e + "), was the --addJars option used?")
- throw e
+ null
}
}
} else {
@@ -722,8 +725,10 @@ class SparkContext(
path
}
}
- addedJars(key) = System.currentTimeMillis
- logInfo("Added JAR " + path + " at " + key + " with timestamp " + addedJars(key))
+ if (key != null) {
+ addedJars(key) = System.currentTimeMillis
+ logInfo("Added JAR " + path + " at " + key + " with timestamp " + addedJars(key))
+ }
}
}
[2/3] git commit: update comment
Posted by pw...@apache.org.
update comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/dd56b212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/dd56b212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/dd56b212
Branch: refs/heads/master
Commit: dd56b2125e630099d19946af6e363b9b03cc31f1
Parents: ceb79a3
Author: Thomas Graves <tg...@apache.org>
Authored: Sun Jan 19 12:21:39 2014 -0600
Committer: Thomas Graves <tg...@apache.org>
Committed: Sun Jan 19 12:21:39 2014 -0600
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/dd56b212/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index a05d5c5..923b4ed 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -708,7 +708,7 @@ class SparkContext(
env.httpFileServer.addJar(new File(fileName))
} catch {
case e: Exception => {
- // For now just throw an error but allow to go through so spark examples work.
+ // For now just log an error but allow to go through so spark examples work.
// The spark examples don't really need the jar distributed since its also
// the app jar.
logError("Error adding jar (" + e + "), was the --addJars option used?")
[3/3] git commit: Merge pull request #470 from
tgravescs/fix_spark_examples_yarn
Posted by pw...@apache.org.
Merge pull request #470 from tgravescs/fix_spark_examples_yarn
Only log error on missing jar to allow spark examples to jar.
Right now to run the spark examples on Yarn you have to use the --addJars option and put the jar in hdfs. To make that nicer so the user doesn't have to specify the --addJars option change it to simply log an error instead of throwing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/792d9084
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/792d9084
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/792d9084
Branch: refs/heads/master
Commit: 792d9084e2bc9f778a00a56fa7dcfe4084153aea
Parents: 256a355 dd56b21
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Jan 19 11:33:11 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Jan 19 11:33:11 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------