fixed a spark path issue due to a bad merge
authorYaniv Rodenski <roadan@gmail.com>
Mon, 14 May 2018 08:46:56 +0000 (18:46 +1000)
committerYaniv Rodenski <roadan@gmail.com>
Mon, 14 May 2018 08:46:56 +0000 (18:46 +1000)
leader/src/main/scala/org/apache/amaterasu/leader/yarn/ApplicationMaster.scala

index 33a45ba..a44202a 100644 (file)
@@ -255,8 +255,8 @@ class ApplicationMaster extends AMRMClientAsync.CallbackHandler with Logging {
         val ctx = Records.newRecord(classOf[ContainerLaunchContext])
         val commands: List[String] = List(
           "/bin/bash ./miniconda.sh -b -p $PWD/miniconda && ",
-          s"/bin/bash ${config.spark.home}/bin/load-spark-env.sh && ",
-          s"java -cp spark/jars/*:executor.jar:${config.spark.home}/jars/*:${config.spark.home}/conf/:${config.YARN.hadoopHomeDir}/conf/ " +
+          s"/bin/bash spark/bin/load-spark-env.sh && ",
+          s"java -cp spark/jars/*:executor.jar:spark/conf/:${config.YARN.hadoopHomeDir}/conf/ " +
             "-Xmx1G " +
             "-Dscala.usejavacp=true " +
             "-Dhdp.version=2.6.1.0-129 " +