Re-arrange comments

mpmolek · mpmolek · commit d10c7a205865 · 2018-11-06T17:02:30.000-05:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala
@@ -408,7 +408,11 @@ private[spark] class RestSubmissionClient(master: String) extends Logging {
 }
 
 private[spark] object RestSubmissionClient {
+
+  // SPARK_HOME and SPARK_CONF_DIR are filtered out because they are usually wrong
+  // on the remote machine (SPARK-12345) (SPARK-25934)
   private val BLACKLISTED_SPARK_ENV_VARS = Set("SPARK_ENV_LOADED", "SPARK_HOME", "SPARK_CONF_DIR")
+  
   private val REPORT_DRIVER_STATUS_INTERVAL = 1000
   private val REPORT_DRIVER_STATUS_MAX_TRIES = 10
   val PROTOCOL_VERSION = "v1"
@@ -418,8 +422,6 @@ private[spark] object RestSubmissionClient {
    */
   private[rest] def filterSystemEnvironment(env: Map[String, String]): Map[String, String] = {
     env.filterKeys { k =>
-      // SPARK_HOME and SPARK_CONF_DIR are filtered out because they are usually wrong
-      // on the remote machine (SPARK-12345) (SPARK-25934)
       (k.startsWith("SPARK_") && !BLACKLISTED_SPARK_ENV_VARS.contains(k)) || k.startsWith("MESOS_")
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,11 @@ private[spark] class RestSubmissionClient(master: String) extends Logging {`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`private[spark] object RestSubmissionClient {`
	`411`	`+`
	`412`	`+ // SPARK_HOME and SPARK_CONF_DIR are filtered out because they are usually wrong`
	`413`	`+ // on the remote machine (SPARK-12345) (SPARK-25934)`
`411`	`414`	`private val BLACKLISTED_SPARK_ENV_VARS = Set("SPARK_ENV_LOADED", "SPARK_HOME", "SPARK_CONF_DIR")`
	`415`	`+`
`412`	`416`	`private val REPORT_DRIVER_STATUS_INTERVAL = 1000`
`413`	`417`	`private val REPORT_DRIVER_STATUS_MAX_TRIES = 10`
`414`	`418`	`val PROTOCOL_VERSION = "v1"`
`@@ -418,8 +422,6 @@ private[spark] object RestSubmissionClient {`
`418`	`422`	`*/`
`419`	`423`	`private[rest] def filterSystemEnvironment(env: Map[String, String]): Map[String, String] = {`
`420`	`424`	`env.filterKeys { k =>`
`421`		`- // SPARK_HOME and SPARK_CONF_DIR are filtered out because they are usually wrong`
`422`		`- // on the remote machine (SPARK-12345) (SPARK-25934)`
`423`	`425`	`(k.startsWith("SPARK_") && !BLACKLISTED_SPARK_ENV_VARS.contains(k)) \|\| k.startsWith("MESOS_")`
`424`	`426`	`}`
`425`	`427`	`}`