Update

apache · Apr 17, 2015 · c63f31f · c63f31f
1 parent 547fd95
commit c63f31f
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -17,6 +17,7 @@
 
 package org.apache.spark.deploy.yarn
 
+import java.io.File
 import java.net.{InetAddress, UnknownHostException, URI, URISyntaxException}
 import java.nio.ByteBuffer
 
@@ -752,8 +753,17 @@ object Client extends Logging {
     if (conf.contains(CONF_PYSPARK_ARCHIVES)) {
       conf.get(CONF_PYSPARK_ARCHIVES)
     } else {
-      val sparkJarPath = SparkContext.jarOfClass(this.getClass).head
-      sparkJarPath.substring(0, sparkJarPath.lastIndexOf('/')) + "/pyspark.zip"
+      SparkContext.jarOfClass(this.getClass) match {
+        case Some(jarPath) =>
+          val path = new File(jarPath)
+          val archives = new File(path.getParent + File.separator + "pyspark.zip")
+          if (archives.exists()) {
+            archives.getAbsolutePath
+          } else {
+            ""
+          }
+        case None => ""
+      }
     }
   }