You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2018/02/01 06:20:48 UTC
[12/12] mesos git commit: Updated the docs for agent ping timeout
flags.
Updated the docs for agent ping timeout flags.
Review: https://reviews.apache.org/r/65344/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/52593a47
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/52593a47
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/52593a47
Branch: refs/heads/master
Commit: 52593a47eeebce0c17c5a557e9a982376c658fd5
Parents: db83a24
Author: Greg Mann <gr...@mesosphere.io>
Authored: Wed Jan 31 22:15:53 2018 -0800
Committer: Greg Mann <gr...@gmail.com>
Committed: Wed Jan 31 22:16:05 2018 -0800
----------------------------------------------------------------------
docs/configuration/master.md | 4 ++--
src/master/flags.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/52593a47/docs/configuration/master.md
----------------------------------------------------------------------
diff --git a/docs/configuration/master.md b/docs/configuration/master.md
index e3cfb24..7b2bb98 100644
--- a/docs/configuration/master.md
+++ b/docs/configuration/master.md
@@ -135,7 +135,7 @@ Example:
<td>
The timeout within which an agent is expected to respond to a
ping from the master. Agents that do not respond within
-max_agent_ping_timeouts ping retries will be asked to shutdown.
+max_agent_ping_timeouts ping retries will be marked unreachable.
<b>NOTE</b>: The total ping timeout (<code>agent_ping_timeout</code> multiplied by
<code>max_agent_ping_timeouts</code>) should be greater than the ZooKeeper
session timeout to prevent useless re-registration attempts.
@@ -370,7 +370,7 @@ conjunction with <code>--zk</code>. Must be used in conjunction with
<td>
The number of times an agent can fail to respond to a
ping from the master. Agents that do not respond within
-<code>max_agent_ping_timeouts</code> ping retries will be asked to shutdown.
+<code>max_agent_ping_timeouts</code> ping retries will be marked unreachable.
(default: 5)
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/52593a47/src/master/flags.cpp
----------------------------------------------------------------------
diff --git a/src/master/flags.cpp b/src/master/flags.cpp
index b49cb63..2f4aa69 100644
--- a/src/master/flags.cpp
+++ b/src/master/flags.cpp
@@ -484,7 +484,7 @@ mesos::internal::master::Flags::Flags()
flags::DeprecatedName("slave_ping_timeout"),
"The timeout within which an agent is expected to respond to a\n"
"ping from the master. Agents that do not respond within\n"
- "max_agent_ping_timeouts ping retries will be asked to shutdown.\n"
+ "max_agent_ping_timeouts ping retries will be marked unreachable.\n"
"NOTE: The total ping timeout (`agent_ping_timeout` multiplied by\n"
"`max_agent_ping_timeouts`) should be greater than the ZooKeeper\n"
"session timeout to prevent useless re-registration attempts.\n",
@@ -503,7 +503,7 @@ mesos::internal::master::Flags::Flags()
flags::DeprecatedName("max_slave_ping_timeouts"),
"The number of times an agent can fail to respond to a\n"
"ping from the master. Agents that do not respond within\n"
- "`max_agent_ping_timeouts` ping retries will be asked to shutdown.\n",
+ "`max_agent_ping_timeouts` ping retries will be marked unreachable.\n",
DEFAULT_MAX_AGENT_PING_TIMEOUTS,
[](size_t value) -> Option<Error> {
if (value < 1) {