fixed the conversion between scala and kotlin for ActionData
authorYaniv Rodenski <roadan@gmail.com>
Thu, 8 Nov 2018 22:54:04 +0000 (09:54 +1100)
committerYaniv Rodenski <roadan@gmail.com>
Thu, 8 Nov 2018 22:54:04 +0000 (09:54 +1100)
frameworks/spark/dispatcher/src/main/scala/org/apache/amaterasu/frameworks/spark/dispatcher/runners/providers/SparkShellScalaRunnerProvider.scala
leader/src/main/scala/org/apache/amaterasu/leader/mesos/schedulers/JobScheduler.scala

index 525c4f5..5d566a0 100644 (file)
@@ -9,13 +9,13 @@ class SparkShellScalaRunnerProvider extends RunnerSetupProvider {
   private var conf: ClusterConfig = _
 
   override def getCommand(jobId: String, actionData: ActionData, env: String, executorId: String, callbackAddress: String): String =
-    s"$$SPARK_HOME/bin/spark-shell ${actionData.src} --jars spark-runtime-${conf.version}.jar"
+    s"$$SPARK_HOME/bin/spark-shell ${actionData.getSrc} --jars spark-runtime-${conf.version}.jar"
 
   override def getRunnerResources: Array[String] =
     Array[String]()
 
   def getActionResources(jobId: String, actionData: ActionData): Array[String] =
-    Array[String](s"$jobId/${actionData.name}/${actionData.src}")
+    Array[String](s"$jobId/${actionData.getName}/${actionData.getSrc}")
 
   override def getActionDependencies(jobId: String, actionData: ActionData): Array[String] =  Array[String]()
 
index 92737c7..bcd7923 100755 (executable)
@@ -197,7 +197,7 @@ class JobScheduler extends AmaterasuScheduler {
               //creating the command
 
               // TODO: move this into the runner provider somehow
-              copy(get(s"repo/src/${actionData.src}"), get(s"dist/${jobManager.jobId}/${actionData.name}/${actionData.src}"), REPLACE_EXISTING)
+              copy(get(s"repo/src/${actionData.getSrc}"), get(s"dist/${jobManager.jobId}/${actionData.getName}/${actionData.getSrc}"), REPLACE_EXISTING)
 
               println(s"===> ${runnerProvider.getCommand(jobManager.jobId, actionData, env, executorId, "")}")
               val command = CommandInfo