You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/12/07 01:41:35 UTC
mesos git commit: Made "agent_features" flag available on non-Linux
systems.
Repository: mesos
Updated Branches:
refs/heads/master dfe9f51aa -> c0ddcd4c4
Made "agent_features" flag available on non-Linux systems.
The "agent_features" was implemented in a block that was only compiled
on Linux. As it should be available on every target system, the
implementation has been move out of the block.
Review: https://reviews.apache.org/r/64335/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c0ddcd4c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c0ddcd4c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c0ddcd4c
Branch: refs/heads/master
Commit: c0ddcd4c471f45db8b83ded64127cc770b871a69
Parents: dfe9f51
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Wed Dec 6 17:02:03 2017 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Dec 6 17:41:31 2017 -0800
----------------------------------------------------------------------
src/slave/flags.cpp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c0ddcd4c/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 40b3a43..d4b95b7 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -685,6 +685,17 @@ mesos::internal::slave::Flags::Flags()
"This flag has the same syntax as `--effective_capabilities`."
);
+ add(&Flags::disallow_sharing_agent_pid_namespace,
+ "disallow_sharing_agent_pid_namespace",
+ "If set to `true`, each top-level container will have its own pid\n"
+ "namespace, and if the framework requests to share the agent pid\n"
+ "namespace for the top level container, the container launch will be\n"
+ "rejected. If set to `false`, the top-level containers will share the\n"
+ "pid namespace with agent if the framework requests it. This flag will\n"
+ "be ignored if the `namespaces/pid` isolator is not enabled.\n",
+ false);
+#endif
+
add(&Flags::agent_features,
"agent_features",
"JSON representation of agent features to whitelist. We always require\n"
@@ -716,17 +727,6 @@ mesos::internal::slave::Flags::Flags()
return None();
});
- add(&Flags::disallow_sharing_agent_pid_namespace,
- "disallow_sharing_agent_pid_namespace",
- "If set to `true`, each top-level container will have its own pid\n"
- "namespace, and if the framework requests to share the agent pid\n"
- "namespace for the top level container, the container launch will be\n"
- "rejected. If set to `false`, the top-level containers will share the\n"
- "pid namespace with agent if the framework requests it. This flag will\n"
- "be ignored if the `namespaces/pid` isolator is not enabled.\n",
- false);
-#endif
-
add(&Flags::firewall_rules,
"firewall_rules",
"The value could be a JSON-formatted string of rules or a\n"