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 2019/08/20 10:02:35 UTC
[mesos] 05/07: Renamed a storage provider function.
This is an automated email from the ASF dual-hosted git repository.
bbannier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 82cdd40968df7b1d4b2fb4bede5253b20ac2319f
Author: Benjamin Bannier <bb...@apache.org>
AuthorDate: Wed Aug 14 09:33:32 2019 +0200
Renamed a storage provider function.
Review: https://reviews.apache.org/r/71149/
---
src/resource_provider/storage/provider.cpp | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/resource_provider/storage/provider.cpp b/src/resource_provider/storage/provider.cpp
index 6d63260..71aa650 100644
--- a/src/resource_provider/storage/provider.cpp
+++ b/src/resource_provider/storage/provider.cpp
@@ -273,9 +273,8 @@ private:
// truth, such as CSI plugin responses or the status update manager.
Future<Nothing> reconcileResourceProviderState();
Future<Nothing> reconcileOperationStatuses();
- ResourceConversion reconcileResources(
- const Resources& checkpointed,
- const Resources& discovered);
+ ResourceConversion computeConversion(
+ const Resources& checkpointed, const Resources& discovered) const;
// Returns a list of resource conversions to updates volume contexts for
// existing volumes, remove disappeared unconverted volumes, and add newly
@@ -992,9 +991,8 @@ bool StorageLocalResourceProviderProcess::allowsReconciliation(
}
-ResourceConversion StorageLocalResourceProviderProcess::reconcileResources(
- const Resources& checkpointed,
- const Resources& discovered)
+ResourceConversion StorageLocalResourceProviderProcess::computeConversion(
+ const Resources& checkpointed, const Resources& discovered) const
{
// NOTE: If a resource in the checkpointed resources is missing in the
// discovered resources, we will still keep it if it is converted by
@@ -1120,7 +1118,7 @@ StorageLocalResourceProviderProcess::getExistingVolumes()
return vector<ResourceConversion>{
std::move(metadataConversion),
- reconcileResources(std::move(checkpointed), std::move(discovered))};
+ computeConversion(std::move(checkpointed), std::move(discovered))};
}));
}
@@ -1158,7 +1156,7 @@ StorageLocalResourceProviderProcess::getStoragePools()
});
return vector<ResourceConversion>{
- reconcileResources(std::move(checkpointed), std::move(discovered))};
+ computeConversion(std::move(checkpointed), std::move(discovered))};
}));
}