From 4532e5dbdd130c3dbb2701e5ec6e9625d6086763 Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Wed, 19 Aug 2020 10:36:23 -0700 Subject: [PATCH 1/2] Update the log strings we check for in the decommission K8s integration suite to match the changes --- .../spark/deploy/k8s/integrationtest/DecommissionSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala index fd67a03160afb..481dd1117b842 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala @@ -42,7 +42,8 @@ private[spark] trait DecommissionSuite { k8sSuite: KubernetesSuite => mainClass = "", expectedLogOnCompletion = Seq( "Finished waiting, stopping Spark", - "decommissioning executor", + "Received decommission executor message", + "Finished decommissioning", "Final accumulator value is: 100"), appArgs = Array.empty[String], driverPodChecker = doBasicDriverPyPodCheck, From 8a8834049a749d5b17542511eecbad7c0bbbe205 Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Wed, 19 Aug 2020 12:25:49 -0700 Subject: [PATCH 2/2] In the meantine someone moved the DECOMMISSION_ENABLED key --- .../spark/deploy/k8s/integrationtest/DecommissionSuite.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala index 481dd1117b842..6cef7c17beeb0 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DecommissionSuite.scala @@ -17,7 +17,6 @@ package org.apache.spark.deploy.k8s.integrationtest import org.apache.spark.internal.config -import org.apache.spark.internal.config.Worker private[spark] trait DecommissionSuite { k8sSuite: KubernetesSuite => @@ -26,7 +25,7 @@ private[spark] trait DecommissionSuite { k8sSuite: KubernetesSuite => test("Test basic decommissioning", k8sTestTag) { sparkAppConf - .set(Worker.WORKER_DECOMMISSION_ENABLED.key, "true") + .set(config.DECOMMISSION_ENABLED.key, "true") .set("spark.kubernetes.pyspark.pythonVersion", "3") .set("spark.kubernetes.container.image", pyImage) .set(config.STORAGE_DECOMMISSION_ENABLED.key, "true")