You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2020/05/08 00:57:27 UTC
[spark] branch branch-3.0 updated: [SPARK-31646][FOLLOWUP][TESTS]
Add clean up code and disable irrelevent conf
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 57b55ea [SPARK-31646][FOLLOWUP][TESTS] Add clean up code and disable irrelevent conf
57b55ea is described below
commit 57b55eacaaa37b2b5aae2620fb29e046ee736b08
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Thu May 7 17:50:32 2020 -0700
[SPARK-31646][FOLLOWUP][TESTS] Add clean up code and disable irrelevent conf
(cherry picked from commit 24fac1e0c70a783b4d240607639ff20d7dd24191)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.../apache/spark/deploy/ExternalShuffleServiceMetricsSuite.scala | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/core/src/test/scala/org/apache/spark/deploy/ExternalShuffleServiceMetricsSuite.scala b/core/src/test/scala/org/apache/spark/deploy/ExternalShuffleServiceMetricsSuite.scala
index 4757c4a..d681c13 100644
--- a/core/src/test/scala/org/apache/spark/deploy/ExternalShuffleServiceMetricsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/ExternalShuffleServiceMetricsSuite.scala
@@ -20,7 +20,7 @@ package org.apache.spark.deploy
import scala.collection.JavaConverters._
import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite}
-import org.apache.spark.internal.config.SHUFFLE_SERVICE_ENABLED
+import org.apache.spark.internal.config.{SHUFFLE_SERVICE_DB_ENABLED, SHUFFLE_SERVICE_ENABLED}
import org.apache.spark.util.Utils
class ExternalShuffleServiceMetricsSuite extends SparkFunSuite {
@@ -32,6 +32,7 @@ class ExternalShuffleServiceMetricsSuite extends SparkFunSuite {
super.beforeAll()
sparkConf = new SparkConf()
sparkConf.set(SHUFFLE_SERVICE_ENABLED, true)
+ sparkConf.set(SHUFFLE_SERVICE_DB_ENABLED, false)
sparkConf.set("spark.local.dir", System.getProperty("java.io.tmpdir"))
Utils.loadDefaultSparkProperties(sparkConf, null)
val securityManager = new SecurityManager(sparkConf)
@@ -40,7 +41,10 @@ class ExternalShuffleServiceMetricsSuite extends SparkFunSuite {
}
override def afterAll(): Unit = {
- externalShuffleService.stop()
+ if (externalShuffleService != null) {
+ externalShuffleService.stop()
+ }
+ super.afterAll()
}
test("SPARK-31646: metrics should be registered") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org