You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/15 03:19:36 UTC
mesos git commit: Cleaned up ordering in slave constants.
Repository: mesos
Updated Branches:
refs/heads/master 754bb56a5 -> d725a298b
Cleaned up ordering in slave constants.
Review: https://reviews.apache.org/r/44629/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d725a298
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d725a298
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d725a298
Branch: refs/heads/master
Commit: d725a298b413f2ec04f877e46cc75c239f550df1
Parents: 754bb56
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Mar 14 19:18:23 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Mar 14 19:18:23 2016 -0700
----------------------------------------------------------------------
src/slave/constants.hpp | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d725a298/src/slave/constants.hpp
----------------------------------------------------------------------
diff --git a/src/slave/constants.hpp b/src/slave/constants.hpp
index 4110061..3216c96 100644
--- a/src/slave/constants.hpp
+++ b/src/slave/constants.hpp
@@ -30,14 +30,15 @@ namespace slave {
// details in MESOS-1023.
constexpr Duration EXECUTOR_REGISTRATION_TIMEOUT = Minutes(1);
-constexpr Duration EXECUTOR_SHUTDOWN_GRACE_PERIOD = Seconds(5);
constexpr Duration EXECUTOR_REREGISTER_TIMEOUT = Seconds(2);
+
+constexpr Duration EXECUTOR_SHUTDOWN_GRACE_PERIOD = Seconds(5);
constexpr Duration EXECUTOR_SIGNAL_ESCALATION_TIMEOUT = Seconds(3);
+
constexpr Duration RECOVERY_TIMEOUT = Minutes(15);
+
constexpr Duration STATUS_UPDATE_RETRY_INTERVAL_MIN = Seconds(10);
-constexpr Duration STATUS_UPDATE_RETRY_INTERVAL_MAX = Minutes(10);;
-constexpr Duration GC_DELAY = Weeks(1);
-constexpr Duration DISK_WATCH_INTERVAL = Minutes(1);
+constexpr Duration STATUS_UPDATE_RETRY_INTERVAL_MAX = Minutes(10);
// Default backoff interval used by the slave to wait before registration.
constexpr Duration DEFAULT_REGISTRATION_BACKOFF_FACTOR = Seconds(1);
@@ -49,6 +50,9 @@ constexpr Duration DEFAULT_REGISTRATION_BACKOFF_FACTOR = Seconds(1);
// recovery and when it times out slave re-registration.
constexpr Duration REGISTER_RETRY_INTERVAL_MAX = Minutes(1);
+constexpr Duration GC_DELAY = Weeks(1);
+constexpr Duration DISK_WATCH_INTERVAL = Minutes(1);
+
// Minimum free disk capacity enforced by the garbage collector.
constexpr double GC_DISK_HEADROOM = 0.1;
@@ -92,6 +96,10 @@ constexpr Duration DOCKER_REMOVE_DELAY = Hours(6);
// container.
constexpr Duration DOCKER_INSPECT_DELAY = Seconds(1);
+// Default maximum number of docker inspect calls docker ps will invoke
+// in parallel to prevent hitting system's open file descriptor limit.
+constexpr int DOCKER_PS_MAX_INSPECT_CALLS = 100;
+
// Default duration that docker containerizer will wait to check
// docker version.
// TODO(tnachen): Make this a flag.
@@ -103,10 +111,6 @@ constexpr char DEFAULT_AUTHENTICATEE[] = "crammd5";
// Default maximum storage space to be used by the fetcher cache.
constexpr Bytes DEFAULT_FETCHER_CACHE_SIZE = Gigabytes(2);
-// Default maximum number of docker inspect calls docker ps will invoke
-// in parallel to prevent hitting system's open file descriptor limit.
-constexpr int DOCKER_PS_MAX_INSPECT_CALLS = 100;
-
// If no pings received within this timeout, then the slave will
// trigger a re-detection of the master to cause a re-registration.
Duration DEFAULT_MASTER_PING_TIMEOUT();