You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2017/12/08 08:04:23 UTC
[2/3] mesos git commit: Renamed a resource provider call to
UPDATE_PUBLISH_RESOURCES_STATUS.
Renamed a resource provider call to UPDATE_PUBLISH_RESOURCES_STATUS.
Review: https://reviews.apache.org/r/64399
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fb47d1c5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fb47d1c5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fb47d1c5
Branch: refs/heads/master
Commit: fb47d1c548685b3efbee677454829c0c98d66d12
Parents: 2975d7e
Author: Greg Mann <gr...@gmail.com>
Authored: Wed Dec 6 16:42:14 2017 -0800
Committer: Greg Mann <gr...@gmail.com>
Committed: Thu Dec 7 23:06:22 2017 -0800
----------------------------------------------------------------------
.../resource_provider/resource_provider.hpp | 4 +--
.../resource_provider/resource_provider.proto | 12 +++----
.../v1/resource_provider/resource_provider.hpp | 4 +--
.../resource_provider/resource_provider.proto | 12 +++----
src/resource_provider/manager.cpp | 35 +++++++++++---------
src/resource_provider/storage/provider.cpp | 8 +++--
src/resource_provider/validation.cpp | 7 ++--
src/tests/mesos.hpp | 8 ++---
src/tests/resource_provider_manager_tests.cpp | 14 ++++----
9 files changed, 56 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/include/mesos/resource_provider/resource_provider.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/resource_provider/resource_provider.hpp b/include/mesos/resource_provider/resource_provider.hpp
index 45cda42..36d3e6d 100644
--- a/include/mesos/resource_provider/resource_provider.hpp
+++ b/include/mesos/resource_provider/resource_provider.hpp
@@ -27,9 +27,9 @@ namespace resource_provider {
inline std::ostream& operator<<(
std::ostream& stream,
- const Call::UpdatePublishStatus::Status& status)
+ const Call::UpdatePublishResourcesStatus::Status& status)
{
- return stream << Call::UpdatePublishStatus::Status_Name(status);
+ return stream << Call::UpdatePublishResourcesStatus::Status_Name(status);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/include/mesos/resource_provider/resource_provider.proto
----------------------------------------------------------------------
diff --git a/include/mesos/resource_provider/resource_provider.proto b/include/mesos/resource_provider/resource_provider.proto
index 9c69813..2619cd0 100644
--- a/include/mesos/resource_provider/resource_provider.proto
+++ b/include/mesos/resource_provider/resource_provider.proto
@@ -113,10 +113,10 @@ message Call {
// in a backwards-compatible way. See: MESOS-4997.
UNKNOWN = 0;
- SUBSCRIBE = 1; // See 'Subscribe'.
- UPDATE_OFFER_OPERATION_STATUS = 2; // See 'UpdateOfferOperationStatus'.
- UPDATE_STATE = 3; // See 'UpdateState'.
- UPDATE_PUBLISH_STATUS = 4; // See 'UpdatePublishStatus'.
+ SUBSCRIBE = 1; // See 'Subscribe'.
+ UPDATE_OFFER_OPERATION_STATUS = 2; // See 'UpdateOfferOperationStatus'.
+ UPDATE_STATE = 3; // See 'UpdateState'.
+ UPDATE_PUBLISH_RESOURCES_STATUS = 4; // See 'UpdatePublishResourcesStatus'.
}
// Request to subscribe with the master.
@@ -160,7 +160,7 @@ message Call {
required bytes resource_version_uuid = 3;
}
- message UpdatePublishStatus {
+ message UpdatePublishResourcesStatus {
enum Status {
UNKNOWN = 0;
OK = 1;
@@ -185,5 +185,5 @@ message Call {
optional Subscribe subscribe = 3;
optional UpdateOfferOperationStatus update_offer_operation_status = 4;
optional UpdateState update_state = 5;
- optional UpdatePublishStatus update_publish_status = 6;
+ optional UpdatePublishResourcesStatus update_publish_resources_status = 6;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/include/mesos/v1/resource_provider/resource_provider.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/v1/resource_provider/resource_provider.hpp b/include/mesos/v1/resource_provider/resource_provider.hpp
index 3fc45c9..70d8176 100644
--- a/include/mesos/v1/resource_provider/resource_provider.hpp
+++ b/include/mesos/v1/resource_provider/resource_provider.hpp
@@ -28,9 +28,9 @@ namespace resource_provider {
inline std::ostream& operator<<(
std::ostream& stream,
- const Call::UpdatePublishStatus::Status& status)
+ const Call::UpdatePublishResourcesStatus::Status& status)
{
- return stream << Call::UpdatePublishStatus::Status_Name(status);
+ return stream << Call::UpdatePublishResourcesStatus::Status_Name(status);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/include/mesos/v1/resource_provider/resource_provider.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/resource_provider/resource_provider.proto b/include/mesos/v1/resource_provider/resource_provider.proto
index 8340316..135729b 100644
--- a/include/mesos/v1/resource_provider/resource_provider.proto
+++ b/include/mesos/v1/resource_provider/resource_provider.proto
@@ -113,10 +113,10 @@ message Call {
// in a backwards-compatible way. See: MESOS-4997.
UNKNOWN = 0;
- SUBSCRIBE = 1; // See 'Subscribe'.
- UPDATE_OFFER_OPERATION_STATUS = 2; // See 'UpdateOfferOperationStatus'.
- UPDATE_STATE = 3; // See 'UpdateState'.
- UPDATE_PUBLISH_STATUS = 4; // See 'UpdatePublishStatus'.
+ SUBSCRIBE = 1; // See 'Subscribe'.
+ UPDATE_OFFER_OPERATION_STATUS = 2; // See 'UpdateOfferOperationStatus'.
+ UPDATE_STATE = 3; // See 'UpdateState'.
+ UPDATE_PUBLISH_RESOURCES_STATUS = 4; // See 'UpdatePublishResourcesStatus'.
}
// Request to subscribe with the master.
@@ -160,7 +160,7 @@ message Call {
required bytes resource_version_uuid = 3;
}
- message UpdatePublishStatus {
+ message UpdatePublishResourcesStatus {
enum Status {
UNKNOWN = 0;
OK = 1;
@@ -185,5 +185,5 @@ message Call {
optional Subscribe subscribe = 3;
optional UpdateOfferOperationStatus update_offer_operation_status = 4;
optional UpdateState update_state = 5;
- optional UpdatePublishStatus update_publish_status = 6;
+ optional UpdatePublishResourcesStatus update_publish_resources_status = 6;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index c12fd38..9c0d19c 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -180,9 +180,9 @@ private:
ResourceProvider* resourceProvider,
const Call::UpdateState& update);
- void updatePublishStatus(
+ void updatePublishResourcesStatus(
ResourceProvider* resourceProvider,
- const Call::UpdatePublishStatus& update);
+ const Call::UpdatePublishResourcesStatus& update);
ResourceProviderID newResourceProviderId();
@@ -330,8 +330,10 @@ Future<http::Response> ResourceProviderManagerProcess::api(
return Accepted();
}
- case Call::UPDATE_PUBLISH_STATUS: {
- updatePublishStatus(resourceProvider, call.update_publish_status());
+ case Call::UPDATE_PUBLISH_RESOURCES_STATUS: {
+ updatePublishResourcesStatus(
+ resourceProvider,
+ call.update_publish_resources_status());
return Accepted();
}
}
@@ -663,34 +665,35 @@ void ResourceProviderManagerProcess::updateState(
}
-void ResourceProviderManagerProcess::updatePublishStatus(
+void ResourceProviderManagerProcess::updatePublishResourcesStatus(
ResourceProvider* resourceProvider,
- const Call::UpdatePublishStatus& update)
+ const Call::UpdatePublishResourcesStatus& update)
{
Try<UUID> uuid = UUID::fromBytes(update.uuid());
if (uuid.isError()) {
- LOG(ERROR) << "Invalid UUID in UpdatePublishStatus from resource provider "
- << resourceProvider->info.id() << ": " << uuid.error();
+ LOG(ERROR) << "Invalid UUID in UpdatePublishResourcesStatus from resource"
+ << " provider " << resourceProvider->info.id()
+ << ": " << uuid.error();
return;
}
if (!resourceProvider->publishes.contains(uuid.get())) {
- LOG(ERROR) << "Ignoring UpdatePublishStatus from resource provider "
- << resourceProvider->info.id() << " because UUID "
- << uuid->toString() << " is unknown";
+ LOG(ERROR) << "Ignoring UpdatePublishResourcesStatus from resource"
+ << " provider " << resourceProvider->info.id()
+ << " because UUID " << uuid->toString() << " is unknown";
return;
}
LOG(INFO)
- << "Received UPDATE_PUBLISH_STATUS call for PUBLISH event " << uuid.get()
- << " with " << update.status() << " status from resource provider "
- << resourceProvider->info.id();
+ << "Received UPDATE_PUBLISH_RESOURCES_STATUS call for PUBLISH_RESOURCES"
+ << " event " << uuid.get() << " with " << update.status()
+ << " status from resource provider " << resourceProvider->info.id();
- if (update.status() == Call::UpdatePublishStatus::OK) {
+ if (update.status() == Call::UpdatePublishResourcesStatus::OK) {
resourceProvider->publishes.at(uuid.get())->set(Nothing());
} else {
// TODO(jieyu): Consider to include an error message in
- // 'UpdatePublishStatus' and surface that to the caller.
+ // 'UpdatePublishResourcesStatus' and surface that to the caller.
resourceProvider->publishes.at(uuid.get())->fail(
"Failed to publish resources for resource provider " +
stringify(resourceProvider->info.id()) + ": Received " +
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/src/resource_provider/storage/provider.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/storage/provider.cpp b/src/resource_provider/storage/provider.cpp
index d43c8bd..b6db618 100644
--- a/src/resource_provider/storage/provider.cpp
+++ b/src/resource_provider/storage/provider.cpp
@@ -1111,12 +1111,14 @@ void StorageLocalResourceProviderProcess::publishResources(
Call call;
call.mutable_resource_provider_id()->CopyFrom(info.id());
- call.set_type(Call::UPDATE_PUBLISH_STATUS);
+ call.set_type(Call::UPDATE_PUBLISH_RESOURCES_STATUS);
- Call::UpdatePublishStatus* update = call.mutable_update_publish_status();
+ Call::UpdatePublishResourcesStatus* update =
+ call.mutable_update_publish_resources_status();
update->set_uuid(publish.uuid());
update->set_status(future.isReady()
- ? Call::UpdatePublishStatus::OK : Call::UpdatePublishStatus::FAILED);
+ ? Call::UpdatePublishResourcesStatus::OK
+ : Call::UpdatePublishResourcesStatus::FAILED);
auto err = [](const string& uuid, const string& message) {
LOG(ERROR)
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/src/resource_provider/validation.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/validation.cpp b/src/resource_provider/validation.cpp
index 984d593..5b7de74 100644
--- a/src/resource_provider/validation.cpp
+++ b/src/resource_provider/validation.cpp
@@ -74,13 +74,14 @@ Option<Error> validate(const Call& call)
return None();
}
- case Call::UPDATE_PUBLISH_STATUS: {
+ case Call::UPDATE_PUBLISH_RESOURCES_STATUS: {
if (!call.has_resource_provider_id()) {
return Error("Expecting 'resource_provider_id' to be present");
}
- if (!call.has_update_publish_status()) {
- return Error("Expecting 'update_publish_status' to be present.");
+ if (!call.has_update_publish_resources_status()) {
+ return Error(
+ "Expecting 'update_publish_resources_status' to be present.");
}
return None();
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 3b9403c..be976c4 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -3082,13 +3082,13 @@ public:
CHECK(info.has_id());
Call call;
- call.set_type(Call::UPDATE_PUBLISH_STATUS);
+ call.set_type(Call::UPDATE_PUBLISH_RESOURCES_STATUS);
call.mutable_resource_provider_id()->CopyFrom(info.id());
- typename Call::UpdatePublishStatus* update =
- call.mutable_update_publish_status();
+ typename Call::UpdatePublishResourcesStatus* update =
+ call.mutable_update_publish_resources_status();
update->set_uuid(publish.uuid());
- update->set_status(Call::UpdatePublishStatus::OK);
+ update->set_status(Call::UpdatePublishResourcesStatus::OK);
driver->send(call);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/fb47d1c5/src/tests/resource_provider_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_provider_manager_tests.cpp b/src/tests/resource_provider_manager_tests.cpp
index 117003d..7c34b66 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -539,12 +539,13 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess)
ASSERT_EQ(Event::PUBLISH_RESOURCES, event->get().type());
Call call;
- call.set_type(Call::UPDATE_PUBLISH_STATUS);
+ call.set_type(Call::UPDATE_PUBLISH_RESOURCES_STATUS);
call.mutable_resource_provider_id()->CopyFrom(resourceProviderId.get());
- Call::UpdatePublishStatus* update = call.mutable_update_publish_status();
+ Call::UpdatePublishResourcesStatus* update =
+ call.mutable_update_publish_resources_status();
update->set_uuid(event->get().publish_resources().uuid());
- update->set_status(Call::UpdatePublishStatus::OK);
+ update->set_status(Call::UpdatePublishResourcesStatus::OK);
http::Request request;
request.method = "POST";
@@ -644,12 +645,13 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure)
ASSERT_EQ(Event::PUBLISH_RESOURCES, event->get().type());
Call call;
- call.set_type(Call::UPDATE_PUBLISH_STATUS);
+ call.set_type(Call::UPDATE_PUBLISH_RESOURCES_STATUS);
call.mutable_resource_provider_id()->CopyFrom(resourceProviderId.get());
- Call::UpdatePublishStatus* update = call.mutable_update_publish_status();
+ Call::UpdatePublishResourcesStatus* update =
+ call.mutable_update_publish_resources_status();
update->set_uuid(event->get().publish_resources().uuid());
- update->set_status(Call::UpdatePublishStatus::FAILED);
+ update->set_status(Call::UpdatePublishResourcesStatus::FAILED);
http::Request request;
request.method = "POST";