You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/01/15 01:21:42 UTC
git commit: Exposed FrameworkInfo in state.json.
Updated Branches:
refs/heads/master 2dea250c0 -> b34b31807
Exposed FrameworkInfo in state.json.
Review: https://reviews.apache.org/r/15724/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b34b3180
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b34b3180
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b34b3180
Branch: refs/heads/master
Commit: b34b318074760643884e669b0955f2d9df6d24e5
Parents: 2dea250
Author: Vinod Kone <vi...@twitter.com>
Authored: Wed Nov 20 14:56:13 2013 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Tue Jan 14 14:35:30 2014 -0800
----------------------------------------------------------------------
src/master/http.cpp | 3 +++
src/slave/http.cpp | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b34b3180/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 231041d..546e91d 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -176,6 +176,9 @@ JSON::Object model(const Framework& framework)
object.values["id"] = framework.id.value();
object.values["name"] = framework.info.name();
object.values["user"] = framework.info.user();
+ object.values["failover_timeout"] = framework.info.failover_timeout();
+ object.values["checkpoint"] = framework.info.checkpoint();
+ object.values["role"] = framework.info.role();
object.values["registered_time"] = framework.registeredTime.secs();
object.values["unregistered_time"] = framework.unregisteredTime.secs();
object.values["active"] = framework.active;
http://git-wip-us.apache.org/repos/asf/mesos/blob/b34b3180/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 4876364..c8357e2 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -242,6 +242,9 @@ JSON::Object model(const Framework& framework)
object.values["id"] = framework.id.value();
object.values["name"] = framework.info.name();
object.values["user"] = framework.info.user();
+ object.values["failover_timeout"] = framework.info.failover_timeout();
+ object.values["checkpoint"] = framework.info.checkpoint();
+ object.values["role"] = framework.info.role();
JSON::Array executors;
foreachvalue (Executor* executor, framework.executors) {