dongjoon-hyun commented on a change in pull request #29298:
URL: https://github.com/apache/spark/pull/29298#discussion_r462780182
##########
File path:
core/src/test/resources/HistoryServerExpectations/app_environment_expectation.json
##########
@@ -5,283 +5,283 @@
"scalaVersion" : "version 2.11.8"
},
"sparkProperties" : [
Review comment:
The change of this file is a simple sorting.
##########
File path:
core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
##########
@@ -258,6 +260,33 @@ class SubmitRestProtocolSuite extends SparkFunSuite {
| }
|}
""".stripMargin
+ } else {
+ s"""
+ |{
+ | "action" : "CreateSubmissionRequest",
+ | "appArgs" : [ "two slices", "a hint of cinnamon" ],
+ | "appResource" : "honey-walnut-cherry.jar",
+ | "clientSparkVersion" : "1.2.3",
+ | "environmentVariables" : {
+ | "PATH" : "/dev/null"
+ | },
+ | "mainClass" : "org.apache.spark.examples.SparkPie",
+ | "sparkProperties" : {
+ | "spark.driver.extraLibraryPath" : "pickle.jar",
+ | "spark.jars" : "mayonnaise.jar,ketchup.jar",
+ | "spark.driver.supervise" : "false",
+ | "spark.driver.memory" : "1024m",
Review comment:
This is intentionally copied from `2.12` test case. If we change `2.13`
here, we need to change `2.12`, too.
-
https://github.com/apache/spark/pull/29298/files#diff-2ebc20516434bc6dc6ad4e9698e9b15bR239-R261
##########
File path:
core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
##########
@@ -258,6 +260,33 @@ class SubmitRestProtocolSuite extends SparkFunSuite {
| }
|}
""".stripMargin
+ } else {
+ s"""
+ |{
+ | "action" : "CreateSubmissionRequest",
+ | "appArgs" : [ "two slices", "a hint of cinnamon" ],
+ | "appResource" : "honey-walnut-cherry.jar",
+ | "clientSparkVersion" : "1.2.3",
+ | "environmentVariables" : {
+ | "PATH" : "/dev/null"
+ | },
+ | "mainClass" : "org.apache.spark.examples.SparkPie",
+ | "sparkProperties" : {
+ | "spark.driver.extraLibraryPath" : "pickle.jar",
+ | "spark.jars" : "mayonnaise.jar,ketchup.jar",
+ | "spark.driver.supervise" : "false",
+ | "spark.driver.memory" : "1024m",
Review comment:
I'd like to avoid touching the existing Scala 2.12 test case~
##########
File path:
core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
##########
@@ -258,6 +260,33 @@ class SubmitRestProtocolSuite extends SparkFunSuite {
| }
|}
""".stripMargin
+ } else {
+ s"""
+ |{
+ | "action" : "CreateSubmissionRequest",
+ | "appArgs" : [ "two slices", "a hint of cinnamon" ],
+ | "appResource" : "honey-walnut-cherry.jar",
+ | "clientSparkVersion" : "1.2.3",
+ | "environmentVariables" : {
+ | "PATH" : "/dev/null"
+ | },
+ | "mainClass" : "org.apache.spark.examples.SparkPie",
+ | "sparkProperties" : {
+ | "spark.driver.extraLibraryPath" : "pickle.jar",
+ | "spark.jars" : "mayonnaise.jar,ketchup.jar",
+ | "spark.driver.supervise" : "false",
+ | "spark.driver.memory" : "1024m",
Review comment:
Oh, something looks incorrect. Let me check again.
##########
File path:
core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
##########
@@ -258,6 +260,33 @@ class SubmitRestProtocolSuite extends SparkFunSuite {
| }
|}
""".stripMargin
+ } else {
+ s"""
+ |{
+ | "action" : "CreateSubmissionRequest",
+ | "appArgs" : [ "two slices", "a hint of cinnamon" ],
+ | "appResource" : "honey-walnut-cherry.jar",
+ | "clientSparkVersion" : "1.2.3",
+ | "environmentVariables" : {
+ | "PATH" : "/dev/null"
+ | },
+ | "mainClass" : "org.apache.spark.examples.SparkPie",
+ | "sparkProperties" : {
+ | "spark.driver.extraLibraryPath" : "pickle.jar",
+ | "spark.jars" : "mayonnaise.jar,ketchup.jar",
+ | "spark.driver.supervise" : "false",
+ | "spark.driver.memory" : "1024m",
Review comment:
Got it. My bad.
##########
File path:
core/src/test/scala/org/apache/spark/deploy/rest/SubmitRestProtocolSuite.scala
##########
@@ -258,6 +260,33 @@ class SubmitRestProtocolSuite extends SparkFunSuite {
| }
|}
""".stripMargin
+ } else {
+ s"""
+ |{
+ | "action" : "CreateSubmissionRequest",
+ | "appArgs" : [ "two slices", "a hint of cinnamon" ],
+ | "appResource" : "honey-walnut-cherry.jar",
+ | "clientSparkVersion" : "1.2.3",
+ | "environmentVariables" : {
+ | "PATH" : "/dev/null"
+ | },
+ | "mainClass" : "org.apache.spark.examples.SparkPie",
+ | "sparkProperties" : {
+ | "spark.driver.extraLibraryPath" : "pickle.jar",
+ | "spark.jars" : "mayonnaise.jar,ketchup.jar",
+ | "spark.driver.supervise" : "false",
+ | "spark.driver.memory" : "1024m",
Review comment:
Thanks! It's fixed!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
