diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2013-01-22 18:01:12 -0600 |
|---|---|---|
| committer | Stephen Haberman <stephen@exigencecorp.com> | 2013-01-22 18:01:12 -0600 |
| commit | fdec42385a1a8f10f9dd803525cb3c132a25ba53 (patch) | |
| tree | 95f87d9f2e5ce2276f9d06b2ccfa6f402fbb3967 | |
| parent | 2437f6741b9c5b0a778d55d324aabdc4642889e5 (diff) | |
| download | spark-fdec42385a1a8f10f9dd803525cb3c132a25ba53.tar.gz spark-fdec42385a1a8f10f9dd803525cb3c132a25ba53.tar.bz2 spark-fdec42385a1a8f10f9dd803525cb3c132a25ba53.zip | |
Fix SPARK_MEM in ExecutorRunner.
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala index 2f2ea617ff..e910416235 100644 --- a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala +++ b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala @@ -118,7 +118,7 @@ private[spark] class ExecutorRunner( for ((key, value) <- jobDesc.command.environment) { env.put(key, value) } - env.put("SPARK_MEM", memory.toString) + env.put("SPARK_MEM", memory.toString + "m") // In case we are running this from within the Spark Shell, avoid creating a "scala" // parent process for the executor command env.put("SPARK_LAUNCH_WITH_SCALA", "0") |