You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2013/12/04 23:09:39 UTC
git commit: Added flags field in master and slave state.json
Updated Branches:
refs/heads/master 5048e151f -> cf7dcd3fb
Added flags field in master and slave state.json
This patch adds flags field to master and slave state.json end-points
which expose all configuration flags as additional diagnostics.
Review: https://reviews.apache.org/r/15288
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cf7dcd3f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cf7dcd3f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cf7dcd3f
Branch: refs/heads/master
Commit: cf7dcd3fb7295742f324c519776211e9476f9155
Parents: 5048e15
Author: Niklas Q. Nielsen <ni...@mesosphere.io>
Authored: Wed Dec 4 21:16:11 2013 +0000
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Wed Dec 4 22:05:23 2013 +0000
----------------------------------------------------------------------
src/master/http.cpp | 9 +++++++++
src/slave/http.cpp | 9 +++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cf7dcd3f/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 218906a..c8ae437 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -401,6 +401,15 @@ Future<Response> Master::Http::state(const Request& request)
object.values["log_dir"] = master.flags.log_dir.get();
}
+ JSON::Object flags;
+ foreachpair (const string& name, const flags::Flag& flag, master.flags) {
+ Option<string> value = flag.stringify(master.flags);
+ if (value.isSome()) {
+ flags.values[name] = value.get();
+ }
+ }
+ object.values["flags"] = flags;
+
// Model all of the slaves.
{
JSON::Array array;
http://git-wip-us.apache.org/repos/asf/mesos/blob/cf7dcd3f/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 55a5e7d..d667e4d 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -340,6 +340,15 @@ Future<Response> Slave::Http::state(const Request& request)
}
object.values["completed_frameworks"] = completedFrameworks;
+ JSON::Object flags;
+ foreachpair (const string& name, const flags::Flag& flag, slave.flags) {
+ Option<string> value = flag.stringify(slave.flags);
+ if (value.isSome()) {
+ flags.values[name] = value.get();
+ }
+ }
+ object.values["flags"] = flags;
+
return OK(object, request.query.get("jsonp"));
}