Skip to content

Commit

Permalink
[SPARK-12330][MESOS][HOTFIX] Rename timeout config
Browse files Browse the repository at this point in the history
The config already describes time and accepts a general format
that is not restricted to ms. This commit renames the internal
config to use a format that's consistent in Spark.
  • Loading branch information
Andrew Or committed Feb 4, 2016
1 parent 33212cb commit c756bda
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ private[spark] class CoarseMesosSchedulerBackend(
// Maximum number of cores to acquire (TODO: we'll need more flexible controls here)
val maxCores = conf.get("spark.cores.max", Int.MaxValue.toString).toInt

private[this] val shutdownTimeoutMS = conf.getTimeAsMs("spark.mesos.coarse.shutdown.ms", "10s")
.ensuring(_ >= 0, "spark.mesos.coarse.shutdown.ms must be >= 0")
private[this] val shutdownTimeoutMS = conf.getTimeAsMs("spark.mesos.coarse.shutdownTimeout", "10s")
.ensuring(_ >= 0, "spark.mesos.coarse.shutdownTimeout must be >= 0")

// Synchronization protected by stateLock
private[this] var stopCalled: Boolean = false
Expand Down

0 comments on commit c756bda

Please sign in to comment.