Skip to content
Snippets Groups Projects
Commit c756bda4 authored by Andrew Or's avatar Andrew Or
Browse files

[SPARK-12330][MESOS][HOTFIX] Rename timeout config

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.
parent 33212cb9
No related branches found
No related tags found
No related merge requests found
...@@ -62,8 +62,8 @@ private[spark] class CoarseMesosSchedulerBackend( ...@@ -62,8 +62,8 @@ private[spark] class CoarseMesosSchedulerBackend(
// Maximum number of cores to acquire (TODO: we'll need more flexible controls here) // 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 val maxCores = conf.get("spark.cores.max", Int.MaxValue.toString).toInt
private[this] val shutdownTimeoutMS = conf.getTimeAsMs("spark.mesos.coarse.shutdown.ms", "10s") private[this] val shutdownTimeoutMS = conf.getTimeAsMs("spark.mesos.coarse.shutdownTimeout", "10s")
.ensuring(_ >= 0, "spark.mesos.coarse.shutdown.ms must be >= 0") .ensuring(_ >= 0, "spark.mesos.coarse.shutdownTimeout must be >= 0")
// Synchronization protected by stateLock // Synchronization protected by stateLock
private[this] var stopCalled: Boolean = false private[this] var stopCalled: Boolean = false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment