This is an automated email from the ASF dual-hosted git repository. bmahler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 01de23909afc0de9a79cc1eb1047a9b09e244774 Author: Benjamin Mahler <[email protected]> AuthorDate: Fri Jun 28 16:08:14 2019 -0400 Renamed Role::allocatedResources to Role::allocatedAndOfferedResources. This exposes allocated + offered, so it has been renamed accordingly. Review: https://reviews.apache.org/r/71027 --- src/master/http.cpp | 3 ++- src/master/master.hpp | 2 +- src/master/readonly_handler.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/master/http.cpp b/src/master/http.cpp index b42ebb9..1b3d48d 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -2704,7 +2704,8 @@ Future<Response> Master::Http::getRoles( if (master->roles.contains(name)) { Role* role_ = master->roles.at(name); - role.mutable_resources()->CopyFrom(role_->allocatedResources()); + *role.mutable_resources() = + role_->allocatedAndOfferedResources(); foreachkey (const FrameworkID& frameworkId, role_->frameworks) { role.add_frameworks()->CopyFrom(frameworkId); diff --git a/src/master/master.hpp b/src/master/master.hpp index 23dafe7..6da02b8 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -2699,7 +2699,7 @@ struct Role frameworks.erase(framework->id()); } - Resources allocatedResources() const + Resources allocatedAndOfferedResources() const { Resources resources; diff --git a/src/master/readonly_handler.cpp b/src/master/readonly_handler.cpp index 0d1e3dc..5772b7c 100644 --- a/src/master/readonly_handler.cpp +++ b/src/master/readonly_handler.cpp @@ -737,7 +737,8 @@ process::http::Response Master::ReadOnlyHandler::roles( if (role.isNone()) { writer->field("resources", Resources()); } else { - writer->field("resources", (*role)->allocatedResources()); + writer->field( + "resources", (*role)->allocatedAndOfferedResources()); } if (role.isNone()) {
