From 203f902128148821ff7cf7a976ad5f92da1c3841 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Thu, 17 Feb 2022 16:03:10 +0200 Subject: [PATCH 1/3] [SPARK-38242][SS] Sort the SparkSubmit debug output Signed-off-by: Martin Tzvetanov Grigorov --- core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- .../scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index d3c5f0eaf0341..bf972b9dd9be6 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -908,7 +908,7 @@ private[spark] class SparkSubmit extends Logging { logInfo(s"Main class:\n$childMainClass") logInfo(s"Arguments:\n${childArgs.mkString("\n")}") // sysProps may contain sensitive information, so redact before printing - logInfo(s"Spark config:\n${Utils.redact(sparkConf.getAll.toMap).mkString("\n")}") + logInfo(s"Spark config:\n${Utils.redact(sparkConf.getAll.toMap).sorted.mkString("\n")}") logInfo(s"Classpath elements:\n${childClasspath.mkString("\n")}") logInfo("\n") } 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 47fbab52659a4..9a5123f218a63 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -327,7 +327,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S | |Spark properties used, including those specified through | --conf and those from the properties file $propertiesFile: - |${Utils.redact(sparkProperties).mkString(" ", "\n ", "\n")} + |${Utils.redact(sparkProperties).sorted.mkString(" ", "\n ", "\n")} """.stripMargin } From 6e46889d3dd8f32c3fccf01c9a25333787a900f1 Mon Sep 17 00:00:00 2001 From: Hyukjin Kwon Date: Fri, 25 Feb 2022 13:41:57 +0900 Subject: [PATCH 2/3] Update core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala --- .../scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a5123f218a63..9a8b905c12bac 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -327,7 +327,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S | |Spark properties used, including those specified through | --conf and those from the properties file $propertiesFile: - |${Utils.redact(sparkProperties).sorted.mkString(" ", "\n ", "\n")} + |${Utils.redact(sparkProperties).sorted.mkStrng(" ", "\n ", "\n")} """.stripMargin } From dca655f167587176dd9f8fed139b2d12fca32ad0 Mon Sep 17 00:00:00 2001 From: Hyukjin Kwon Date: Fri, 25 Feb 2022 13:42:12 +0900 Subject: [PATCH 3/3] Update core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala --- .../scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a8b905c12bac..9a5123f218a63 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -327,7 +327,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S | |Spark properties used, including those specified through | --conf and those from the properties file $propertiesFile: - |${Utils.redact(sparkProperties).sorted.mkStrng(" ", "\n ", "\n")} + |${Utils.redact(sparkProperties).sorted.mkString(" ", "\n ", "\n")} """.stripMargin }