You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2017/11/08 16:01:26 UTC
[5/9] mesos git commit: Added resource version to resource provider
UpdateTotalResources call.
Added resource version to resource provider UpdateTotalResources call.
This patch surfaces this information to resource provider manager
users like the agent. In a later patch we will modify the agent to
forward this information to the master.
Review: https://reviews.apache.org/r/63491/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1c9b46b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1c9b46b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1c9b46b
Branch: refs/heads/master
Commit: b1c9b46b97e64c333709b73274a5ae3436b7fda7
Parents: e37b133
Author: Benjamin Bannier <bb...@apache.org>
Authored: Wed Nov 8 00:52:04 2017 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Wed Nov 8 15:51:20 2017 +0100
----------------------------------------------------------------------
src/resource_provider/manager.cpp | 14 +++++++++++---
src/resource_provider/message.hpp | 4 +++-
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1c9b46b/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index a878507..bcc833b 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -434,9 +434,17 @@ void ResourceProviderManagerProcess::updateState(
// TODO(chhsiao): Report pending operations.
- ResourceProviderMessage::UpdateTotalResources updateTotalResources;
- updateTotalResources.id = resourceProvider->info.id();
- updateTotalResources.total = resourceProvider->resources;
+ Try<UUID> resourceVersionUuid =
+ UUID::fromBytes(update.resource_version_uuid());
+
+ CHECK_SOME(resourceVersionUuid)
+ << "Could not deserialize version of resource provider "
+ << resourceProvider->info.id() << ": " << resourceVersionUuid.error();
+
+ ResourceProviderMessage::UpdateTotalResources updateTotalResources{
+ resourceProvider->info.id(),
+ resourceVersionUuid.get(),
+ resourceProvider->resources};
ResourceProviderMessage message;
message.type = ResourceProviderMessage::Type::UPDATE_TOTAL_RESOURCES;
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1c9b46b/src/resource_provider/message.hpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/message.hpp b/src/resource_provider/message.hpp
index 931aab6..a1a84c1 100644
--- a/src/resource_provider/message.hpp
+++ b/src/resource_provider/message.hpp
@@ -36,8 +36,10 @@ struct ResourceProviderMessage
UPDATE_TOTAL_RESOURCES
};
- struct UpdateTotalResources {
+ struct UpdateTotalResources
+ {
ResourceProviderID id;
+ UUID resourceVersionUuid;
Resources total;
};