You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2017/08/30 06:48:42 UTC
[1/3] mesos git commit: Removed duplicate using directive.
Repository: mesos
Updated Branches:
refs/heads/master 718d27b41 -> 3be138715
Removed duplicate using directive.
Review: https://reviews.apache.org/r/61689/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/94269667
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/94269667
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/94269667
Branch: refs/heads/master
Commit: 94269667ec1da57c6fbc309aa10d3cc47e6cc6c4
Parents: 718d27b
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Tue Aug 29 23:43:40 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Tue Aug 29 23:43:40 2017 -0700
----------------------------------------------------------------------
src/slave/main.cpp | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/94269667/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index a4a8ced..9041b08 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -81,8 +81,6 @@ using mesos::master::detector::MasterDetector;
using mesos::modules::Anonymous;
using mesos::modules::ModuleManager;
-using mesos::master::detector::MasterDetector;
-
using mesos::slave::QoSController;
using mesos::slave::ResourceEstimator;
[2/3] mesos git commit: Added `--zk_session_timeout` flag for agent.
Posted by ya...@apache.org.
Added `--zk_session_timeout` flag for agent.
Currently `ZooKeeperMasterDetector` in agent uses default session
timeout and there's no way to configure it. This patch introduces
`--zk_session_timeout` flag for agent similar to the one in master.
Review: https://reviews.apache.org/r/61690/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f195e596
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f195e596
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f195e596
Branch: refs/heads/master
Commit: f195e596fa940cd7d44e627dd4749cdd72d7f298
Parents: 9426966
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Tue Aug 29 23:44:02 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Tue Aug 29 23:47:49 2017 -0700
----------------------------------------------------------------------
src/slave/flags.cpp | 7 +++++++
src/slave/flags.hpp | 2 ++
src/slave/main.cpp | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f195e596/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 3b02f3e..490f78e 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -1257,6 +1257,13 @@ mesos::internal::slave::Flags::Flags()
" `zk://username:password@host1:port1,host2:port2,.../path`\n"
" `file:///path/to/file` (where file contains one of the above)");
+ // TODO(xujyan): Pull master constant ZOOKEEPER_SESSION_TIMEOUT into
+ // a common constants header.
+ add(&Flags::zk_session_timeout,
+ "zk_session_timeout",
+ "ZooKeeper session timeout.",
+ Seconds(10));
+
add(&Flags::ip_discovery_command,
"ip_discovery_command",
"Optional IP discovery binary: if set, it is expected to emit\n"
http://git-wip-us.apache.org/repos/asf/mesos/blob/f195e596/src/slave/flags.hpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index 2970fea..ab73fc7 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -182,6 +182,8 @@ public:
Option<std::string> advertise_port;
Option<std::string> master;
+ Duration zk_session_timeout;
+
// Optional IP discover script that will set the slave's IP.
// If set, its output is expected to be a valid parseable IP string.
Option<std::string> ip_discovery_command;
http://git-wip-us.apache.org/repos/asf/mesos/blob/f195e596/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 9041b08..b8e275c 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -489,7 +489,7 @@ int main(int argc, char** argv)
}
Try<MasterDetector*> detector_ = MasterDetector::create(
- flags.master, flags.master_detector);
+ flags.master, flags.master_detector, flags.zk_session_timeout);
if (detector_.isError()) {
EXIT(EXIT_FAILURE)
[3/3] mesos git commit: Moved `--zk_session_timeout` flag docs to the
common flags section.
Posted by ya...@apache.org.
Moved `--zk_session_timeout` flag docs to the common flags section.
Mesos agents now accept this flag.
Review: https://reviews.apache.org/r/61965/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3be13871
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3be13871
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3be13871
Branch: refs/heads/master
Commit: 3be138715f330f36499c23bc19dac70c79374ab0
Parents: f195e59
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Tue Aug 29 23:44:17 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Tue Aug 29 23:47:56 2017 -0700
----------------------------------------------------------------------
docs/configuration.md | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3be13871/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 9cadf0f..1605e3d 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -310,6 +310,14 @@ Port to listen on. (master default: 5050; agent default: 5051)
Show version and exit. (default: false)
</td>
</tr>
+<tr>
+ <td>
+ --zk_session_timeout=VALUE
+ </td>
+ <td>
+ZooKeeper session timeout. (default: 10secs)
+ </td>
+</tr>
</table>
*These logging options can also be supplied to both masters and agents.*
@@ -940,14 +948,6 @@ machines are accepted. Path can be of the form
<code>file:///path/to/file</code> or <code>/path/to/file</code>.
</td>
</tr>
-<tr>
- <td>
- --zk_session_timeout=VALUE
- </td>
- <td>
-ZooKeeper session timeout. (default: 10secs)
- </td>
-</tr>
</table>
*Flags available when configured with `--with-network-isolator`*