You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2018/04/25 15:13:08 UTC
[4/9] mesos git commit: Revert "Remembered recovered and subscribed
providers in ephemeral state."
Revert "Remembered recovered and subscribed providers in ephemeral state."
This reverts commit ac870c00ab11ccc14b9c872c78130ef4d568c0ee.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/26626f42
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/26626f42
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/26626f42
Branch: refs/heads/master
Commit: 26626f42e974ec012a276f08006231723f72e51b
Parents: 2855a6b
Author: Alexander Rukletsov <al...@apache.org>
Authored: Wed Apr 25 17:08:57 2018 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Apr 25 17:08:57 2018 +0200
----------------------------------------------------------------------
src/resource_provider/manager.cpp | 22 ----------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/26626f42/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index 32f23a7..6393e7a 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -208,10 +208,6 @@ private:
struct ResourceProviders
{
hashmap<ResourceProviderID, Owned<ResourceProvider>> subscribed;
- hashmap<
- ResourceProviderID,
- mesos::resource_provider::registry::ResourceProvider>
- known;
} resourceProviders;
struct Metrics
@@ -257,13 +253,6 @@ void ResourceProviderManagerProcess::initialize()
Future<Nothing> ResourceProviderManagerProcess::recover(
const mesos::resource_provider::registry::Registry& registry)
{
- foreach (
- const mesos::resource_provider::registry::ResourceProvider&
- resourceProvider,
- registry.resource_providers()) {
- resourceProviders.known.put(resourceProvider.id(), resourceProvider);
- }
-
recovered.set(Nothing());
return Nothing();
@@ -708,17 +697,6 @@ void ResourceProviderManagerProcess::subscribe(
resourceProviders.subscribed.put(
resourceProviderId,
std::move(resourceProvider));
-
- if (!resourceProviders.known.contains(resourceProviderId)) {
- mesos::resource_provider::registry::ResourceProvider resourceProvider_;
- resourceProvider_.mutable_id()->CopyFrom(resourceProviderId);
-
- resourceProviders.known.put(
- resourceProviderId,
- std::move(resourceProvider_));
-
- // TODO(bbannier): Persist this information in the registry.
- }
}