Skip to content

[SPARK-26491][CORE][TEST] Use ConfigEntry for hardcoded configs for test categories #23413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mgaido91 wants to merge 7 commits into from
Closed

[SPARK-26491][CORE][TEST] Use ConfigEntry for hardcoded configs for test categories #23413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73618ce
[SPARK-26491][CORE][TEST] Use ConfigEntry for hardcoded configs for t…
mgaido91 Dec 30, 2018
ba41657
fix
mgaido91 Dec 30, 2018
b54a07b
address comments
mgaido91 Jan 3, 2019
a0ae515
fix failure
mgaido91 Jan 3, 2019
10d1a97
Merge branch 'master' of github.com:apache/spark into SPARK-26491
mgaido91 Jan 5, 2019
10e0237
address comment
mgaido91 Jan 5, 2019
0df2dfe
fix build
mgaido91 Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@mgaido91
mgaido91 committed Jan 3, 2019
commit b54a07bec7035124191029c4a89070b09325dcad
4 changes: 1 addition & 3 deletions core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import org.apache.spark.deploy.ExternalShuffleService
import org.apache.spark.deploy.master.{DriverState, Master}
import org.apache.spark.deploy.worker.ui.WorkerWebUI
import org.apache.spark.internal.{config, Logging}
import org.apache.spark.internal.config.Tests.IS_TESTING
import org.apache.spark.metrics.MetricsSystem
import org.apache.spark.rpc._
import org.apache.spark.util.{SparkUncaughtExceptionHandler, ThreadUtils, Utils}
Expand Down Expand Up @@ -104,7 +103,6 @@ private[deploy] class Worker(
private val CLEANUP_NON_SHUFFLE_FILES_ENABLED =
conf.getBoolean("spark.storage.cleanupFilesAfterExecutorExit", true)

private val testing: Boolean = sys.props.contains(IS_TESTING.key)
private var master: Option[RpcEndpointRef] = None

/**
Expand All @@ -128,7 +126,7 @@ private[deploy] class Worker(
private var connected = false
private val workerId = generateWorkerId()
private val sparkHome =
if (testing) {
if (Utils.isTesting) {
assert(sys.props.contains("spark.test.home"), "spark.test.home is not set!")
new File(sys.props("spark.test.home"))
} else {
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/scala/org/apache/spark/executor/ProcfsMetricsGetter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import scala.util.Try

import org.apache.spark.{SparkEnv, SparkException}
import org.apache.spark.internal.{config, Logging}
import org.apache.spark.internal.config.Tests.IS_TESTING
import org.apache.spark.util.Utils


Expand All @@ -44,7 +43,7 @@ private[spark] case class ProcfsMetrics(
// project.
private[spark] class ProcfsMetricsGetter(procfsDir: String = "/proc/") extends Logging {
private val procfsStatFile = "stat"
private val testing = sys.env.contains("SPARK_TESTING") || sys.props.contains(IS_TESTING.key)
private val testing = Utils.isTesting
private val pageSize = computePageSize()
private var isAvailable: Boolean = isProcfsAvailable
private val pid = computePid()
Expand Down