diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
index 94bd2c477a35b..cbc1f3fe9ee22 100755
--- a/conf/spark-env.sh.template
+++ b/conf/spark-env.sh.template
@@ -53,6 +53,9 @@
 # - SPARK_SHUFFLE_OPTS, to set config properties only for the external shuffle service (e.g. "-Dx=y")
 # - SPARK_DAEMON_JAVA_OPTS, to set config properties for all daemons (e.g. "-Dx=y")
 # - SPARK_PUBLIC_DNS, to set the public dns name of the master or workers
+# - SPARK_EXECUTOR_LAUNCH_PREFIX, to set prefix of executor launch command lines,
+#                                 only support standalone mode, YARN client mode should use
+#                                 spark.yarn.appMasterEnv.SPARK_EXECUTOR_LAUNCH_PREFIX
 
 # Generic options for the daemons used in the standalone deploy mode
 # - SPARK_CONF_DIR      Alternate conf dir. (Default: ${SPARK_HOME}/conf)
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
index 93578855122cd..7a4f7b79c17da 100644
--- a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
+++ b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
@@ -209,7 +209,7 @@ object YarnSparkHadoopUtil {
       if (Utils.isWindows) {
         javaOpts += escapeForShell("-XX:OnOutOfMemoryError=taskkill /F /PID %%%%p")
       } else {
-        javaOpts += "-XX:OnOutOfMemoryError='kill %p'"
+        javaOpts += escapeForShell("-XX:OnOutOfMemoryError='kill %p'")
       }
     }
   }