You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2016/02/04 21:06:14 UTC
spark git commit: [SPARK-12330][MESOS][HOTFIX] Rename timeout config
Repository: spark
Updated Branches:
refs/heads/master 33212cb9a -> c756bda47
[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.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c756bda4
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c756bda4
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c756bda4
Branch: refs/heads/master
Commit: c756bda477f458ba4aad7fdb2026263507e0ad9b
Parents: 33212cb
Author: Andrew Or <an...@databricks.com>
Authored: Thu Feb 4 12:04:54 2016 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 4 12:04:54 2016 -0800
----------------------------------------------------------------------
.../scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c756bda4/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
index 722293b..8ed7553 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org