Repository: mesos Updated Branches: refs/heads/1.5.x fee976201 -> 663942121
Added `vector<Resource>` overloads for `(down/up)gradeResources`. Review: https://reviews.apache.org/r/65029 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66394212 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66394212 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66394212 Branch: refs/heads/1.5.x Commit: 66394212160de3789f54b41fb66749f990ee8339 Parents: fee9762 Author: Michael Park <[email protected]> Authored: Mon Jan 8 11:50:06 2018 -0800 Committer: Michael Park <[email protected]> Committed: Wed Jan 10 13:36:52 2018 -0800 ---------------------------------------------------------------------- src/common/resources_utils.cpp | 25 +++++++++++++++++++++---- src/common/resources_utils.hpp | 6 ++++++ 2 files changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/66394212/src/common/resources_utils.cpp ---------------------------------------------------------------------- diff --git a/src/common/resources_utils.cpp b/src/common/resources_utils.cpp index 967cfd7..99b16e0 100644 --- a/src/common/resources_utils.cpp +++ b/src/common/resources_utils.cpp @@ -489,11 +489,13 @@ void upgradeResource(Resource* resource) void upgradeResources(RepeatedPtrField<Resource>* resources) { - CHECK_NOTNULL(resources); + convertResourceFormat(resources, POST_RESERVATION_REFINEMENT); +} - foreach (Resource& resource, *resources) { - upgradeResource(&resource); - } + +void upgradeResources(vector<Resource>* resources) +{ + convertResourceFormat(resources, POST_RESERVATION_REFINEMENT); } @@ -790,6 +792,21 @@ Try<Nothing> downgradeResources(RepeatedPtrField<Resource>* resources) } +Try<Nothing> downgradeResources(vector<Resource>* resources) +{ + CHECK_NOTNULL(resources); + + foreach (Resource& resource, *resources) { + Try<Nothing> result = downgradeResource(&resource); + if (result.isError()) { + return result; + } + } + + return Nothing(); +} + + Try<Nothing> downgradeResources(Message* message) { CHECK_NOTNULL(message); http://git-wip-us.apache.org/repos/asf/mesos/blob/66394212/src/common/resources_utils.hpp ---------------------------------------------------------------------- diff --git a/src/common/resources_utils.hpp b/src/common/resources_utils.hpp index 611e267..73d070d 100644 --- a/src/common/resources_utils.hpp +++ b/src/common/resources_utils.hpp @@ -166,6 +166,9 @@ void upgradeResource(Resource* resource); void upgradeResources(google::protobuf::RepeatedPtrField<Resource>* resources); +void upgradeResources(std::vector<Resource>* resources); + + void upgradeResources(google::protobuf::Message* message); @@ -200,6 +203,9 @@ Try<Nothing> downgradeResources( google::protobuf::RepeatedPtrField<Resource>* resources); +Try<Nothing> downgradeResources(std::vector<Resource>* resources); + + Try<Nothing> downgradeResources(google::protobuf::Message* message);
