aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
index 92e0917743..2b72c61cc8 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -75,6 +75,10 @@ private[spark] class SparkSubmitArguments(args: Seq[String]) {
defaultProperties
}
+ // Respect SPARK_*_MEMORY for cluster mode
+ driverMemory = sys.env.get("SPARK_DRIVER_MEMORY").orNull
+ executorMemory = sys.env.get("SPARK_EXECUTOR_MEMORY").orNull
+
parseOpts(args.toList)
mergeSparkProperties()
checkRequiredArguments()