Updated Branches: refs/heads/master be7e8da98 -> 3d4ad84b6
include the appid in the cmd line arguments to Executors Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/36e832bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/36e832bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/36e832bf Branch: refs/heads/master Commit: 36e832bff06ba053ce1cc69776e0d9fb0c61e7e1 Parents: aadeda5 Author: Imran Rashid <[email protected]> Authored: Thu Nov 7 01:11:49 2013 -0600 Committer: Imran Rashid <[email protected]> Committed: Thu Nov 7 01:11:49 2013 -0600 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala | 2 +- .../org/apache/spark/executor/CoarseGrainedExecutorBackend.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/36e832bf/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala index 8fabc95..fff9cb6 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala @@ -104,7 +104,7 @@ private[spark] class ExecutorRunner( // SPARK-698: do not call the run.cmd script, as process.destroy() // fails to kill a process tree on Windows Seq(runner) ++ buildJavaOpts() ++ Seq(command.mainClass) ++ - command.arguments.map(substituteVariables) + (command.arguments ++ Seq(appId)).map(substituteVariables) } /** http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/36e832bf/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala index 80ff4c5..caee6b0 100644 --- a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala +++ b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala @@ -111,7 +111,7 @@ private[spark] object CoarseGrainedExecutorBackend { def main(args: Array[String]) { if (args.length < 4) { - //the reason we allow the last frameworkId argument is to make it easy to kill rogue executors + //the reason we allow the last appid argument is to make it easy to kill rogue executors System.err.println( "Usage: CoarseGrainedExecutorBackend <driverUrl> <executorId> <hostname> <cores> " + "[<appid>]")
