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 2018/03/21 13:11:50 UTC

[2/2] mesos git commit: Introduced helper for creating Mesos UUIDs.

Introduced helper for creating Mesos UUIDs.

Review: https://reviews.apache.org/r/65674/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/42848653
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/42848653
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/42848653

Branch: refs/heads/master
Commit: 42848653b2a9cb5b970264d97bbdee0177422297
Parents: 95189d8
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Wed Mar 21 13:27:22 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Wed Mar 21 13:27:22 2018 +0100

----------------------------------------------------------------------
 src/common/protobuf_utils.cpp                   | 18 +++++++++++++--
 src/common/protobuf_utils.hpp                   |  5 +++++
 src/resource_provider/manager.cpp               |  4 ++--
 src/resource_provider/storage/provider.cpp      | 23 +++++---------------
 src/slave/slave.cpp                             |  6 ++---
 .../operation_status_update_manager_tests.cpp   |  7 ++++--
 src/tests/resource_provider_manager_tests.cpp   |  8 +++----
 .../resource_provider_validation_tests.cpp      |  8 ++++---
 src/tests/slave_tests.cpp                       |  8 +++----
 9 files changed, 49 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 87c9b88..2acdc79 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -440,7 +440,7 @@ OperationStatus createOperationStatus(
   }
 
   if (uuid.isSome()) {
-    status.mutable_uuid()->set_value(uuid->toBytes());
+    status.mutable_uuid()->CopyFrom(protobuf::createUUID(uuid.get()));
   }
 
   return status;
@@ -466,7 +466,7 @@ Operation createOperation(
   if (operationUUID.isSome()) {
     operation.mutable_uuid()->CopyFrom(operationUUID.get());
   } else {
-    operation.mutable_uuid()->set_value(id::UUID::random().toBytes());
+    operation.mutable_uuid()->CopyFrom(protobuf::createUUID());
   }
 
   return operation;
@@ -497,6 +497,20 @@ UpdateOperationStatusMessage createUpdateOperationStatusMessage(
 }
 
 
+UUID createUUID(const Option<id::UUID>& uuid)
+{
+  UUID uuid_;
+
+  if (uuid.isSome()) {
+    uuid_.set_value(uuid->toBytes());
+  } else {
+    uuid_.set_value(id::UUID::random().toBytes());
+  }
+
+  return uuid_;
+}
+
+
 /**
  * Creates a MasterInfo protobuf from the process's UPID.
  *

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/common/protobuf_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp
index b33d126..bb584f9 100644
--- a/src/common/protobuf_utils.hpp
+++ b/src/common/protobuf_utils.hpp
@@ -184,6 +184,11 @@ UpdateOperationStatusMessage createUpdateOperationStatusMessage(
     const Option<SlaveID>& slaveId = None());
 
 
+// Create a `UUID`. If `uuid` is given it is used to initialize
+// the created `UUID`; otherwise a random `UUID` is returned.
+UUID createUUID(const Option<id::UUID>& uuid = None());
+
+
 // Helper function that creates a MasterInfo from UPID.
 MasterInfo createMasterInfo(const process::UPID& pid);
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index a4fdb95..2d3ffcd 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -40,6 +40,7 @@
 #include <stout/uuid.hpp>
 
 #include "common/http.hpp"
+#include "common/protobuf_utils.hpp"
 #include "common/recordio.hpp"
 #include "common/resources_utils.hpp"
 
@@ -545,8 +546,7 @@ Future<Nothing> ResourceProviderManagerProcess::publishResources(
   foreachpair (const ResourceProviderID& resourceProviderId,
                const Resources& resources,
                providedResources) {
-    UUID uuid;
-    uuid.set_value(id::UUID::random().toBytes());
+    UUID uuid = protobuf::createUUID();
 
     Event event;
     event.set_type(Event::PUBLISH_RESOURCES);

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/resource_provider/storage/provider.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/storage/provider.cpp b/src/resource_provider/storage/provider.cpp
index bb19ed4..88169be 100644
--- a/src/resource_provider/storage/provider.cpp
+++ b/src/resource_provider/storage/provider.cpp
@@ -1162,12 +1162,9 @@ Future<Nothing> StorageLocalResourceProviderProcess::reconcileStatusUpdates()
             ? statusUpdateManagerState.streams.at(uuid)->updates.size() : 0;
 
         for (int i = numStatuses; i < operation.statuses().size(); i++) {
-          UUID uuid_;
-          uuid_.set_value(uuid.toBytes());
-
           UpdateOperationStatusMessage update =
             protobuf::createUpdateOperationStatusMessage(
-                uuid_,
+                protobuf::createUUID(uuid),
                 operation.statuses(i),
                 None(),
                 operation.has_framework_id()
@@ -1436,16 +1433,13 @@ void StorageLocalResourceProviderProcess::applyOperation(
         " (expected: " + stringify(resourceVersion) + ")");
   }
 
-  UUID uuid_;
-  uuid_.set_value(uuid->toBytes());
-
   CHECK(!operations.contains(uuid.get()));
   operations[uuid.get()] = protobuf::createOperation(
       operation.info(),
       protobuf::createOperationStatus(OPERATION_PENDING, operationId),
       frameworkId,
       slaveId,
-      uuid_);
+      protobuf::createUUID(uuid.get()));
 
   checkpointResourceProviderState();
 
@@ -2722,12 +2716,9 @@ void StorageLocalResourceProviderProcess::dropOperation(
   LOG(WARNING)
     << "Dropping operation (uuid: " << operationUuid << "): " << message;
 
-  UUID operationUuid_;
-  operationUuid_.set_value(operationUuid.toBytes());
-
   UpdateOperationStatusMessage update =
     protobuf::createUpdateOperationStatusMessage(
-       operationUuid_,
+       protobuf::createUUID(operationUuid),
        protobuf::createOperationStatus(
            OPERATION_DROPPED,
            operationId,
@@ -3027,13 +3018,10 @@ Try<Nothing> StorageLocalResourceProviderProcess::updateOperationStatus(
 
   checkpointResourceProviderState();
 
-  UUID operationUuid_;
-  operationUuid_.set_value(operationUuid.toBytes());
-
   // Send out the status update for the operation.
   UpdateOperationStatusMessage update =
     protobuf::createUpdateOperationStatusMessage(
-        operationUuid_,
+        protobuf::createUUID(operationUuid),
         operation.latest_status(),
         None(),
         operation.has_framework_id()
@@ -3114,7 +3102,8 @@ void StorageLocalResourceProviderProcess::sendResourceProviderStateUpdate()
 
   Call::UpdateState* update = call.mutable_update_state();
   update->mutable_resources()->CopyFrom(totalResources);
-  update->mutable_resource_version_uuid()->set_value(resourceVersion.toBytes());
+  update->mutable_resource_version_uuid()->CopyFrom(
+      protobuf::createUUID(resourceVersion));
 
   foreachvalue (const Operation& operation, operations) {
     update->add_operations()->CopyFrom(operation);

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 915d4f1..336c906 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -226,10 +226,8 @@ Slave::Slave(const string& id,
     resourceEstimator(_resourceEstimator),
     qosController(_qosController),
     secretGenerator(_secretGenerator),
-    authorizer(_authorizer)
-    {
-      resourceVersion.set_value(id::UUID::random().toBytes());
-    }
+    authorizer(_authorizer),
+    resourceVersion(protobuf::createUUID()) {}
 
 
 Slave::~Slave()

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/tests/operation_status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/operation_status_update_manager_tests.cpp b/src/tests/operation_status_update_manager_tests.cpp
index c4429f4..e617570 100644
--- a/src/tests/operation_status_update_manager_tests.cpp
+++ b/src/tests/operation_status_update_manager_tests.cpp
@@ -33,6 +33,8 @@
 
 #include <stout/os/ftruncate.hpp>
 
+#include "common/protobuf_utils.hpp"
+
 #include "slave/constants.hpp"
 
 #include "tests/mesos.hpp"
@@ -98,7 +100,8 @@ protected:
   {
     UpdateOperationStatusMessage statusUpdate;
 
-    statusUpdate.mutable_operation_uuid()->set_value(operationUuid.toBytes());
+    statusUpdate.mutable_operation_uuid()->CopyFrom(
+        protobuf::createUUID(operationUuid));
 
     if (frameworkId.isSome()) {
       statusUpdate.mutable_framework_id()->CopyFrom(frameworkId.get());
@@ -106,7 +109,7 @@ protected:
 
     OperationStatus* status = statusUpdate.mutable_status();
     status->set_state(state);
-    status->mutable_uuid()->set_value(uuid.toBytes());
+    status->mutable_uuid()->CopyFrom(protobuf::createUUID(uuid));
 
     return statusUpdate;
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/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 c8997ec..718436e 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -46,6 +46,7 @@
 #include <stout/try.hpp>
 
 #include "common/http.hpp"
+#include "common/protobuf_utils.hpp"
 #include "common/recordio.hpp"
 
 #include "internal/devolve.hpp"
@@ -316,8 +317,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState)
     Call::UpdateState* updateState = call.mutable_update_state();
 
     updateState->mutable_resources()->CopyFrom(v1::Resources(resources));
-    updateState->mutable_resource_version_uuid()->set_value(
-        id::UUID::random().toBytes());
+    updateState->mutable_resource_version_uuid()->CopyFrom(
+        evolve(protobuf::createUUID()));
 
     http::Request request;
     request.method = "POST";
@@ -416,8 +417,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOperationStatus)
     mesos::v1::OperationStatus status;
     status.set_state(mesos::v1::OperationState::OPERATION_FINISHED);
 
-    mesos::v1::UUID operationUUID;
-    operationUUID.set_value(id::UUID::random().toBytes());
+    mesos::v1::UUID operationUUID = evolve(protobuf::createUUID());;
 
     Call call;
     call.set_type(Call::UPDATE_OPERATION_STATUS);

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/tests/resource_provider_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_provider_validation_tests.cpp b/src/tests/resource_provider_validation_tests.cpp
index 9f34c45..a998941 100644
--- a/src/tests/resource_provider_validation_tests.cpp
+++ b/src/tests/resource_provider_validation_tests.cpp
@@ -25,6 +25,8 @@
 #include <stout/option.hpp>
 #include <stout/uuid.hpp>
 
+#include "common/protobuf_utils.hpp"
+
 #include "resource_provider/validation.hpp"
 
 namespace call = mesos::internal::resource_provider::validation::call;
@@ -74,7 +76,7 @@ TEST(ResourceProviderCallValidationTest, UpdateOperationStatus)
     call.mutable_update_operation_status();
 
   update->mutable_framework_id()->set_value(id::UUID::random().toString());
-  update->mutable_operation_uuid()->set_value(id::UUID::random().toBytes());
+  update->mutable_operation_uuid()->CopyFrom(protobuf::createUUID());
 
   OperationStatus* status = update->mutable_status();
   status->mutable_operation_id()->set_value(id::UUID::random().toString());
@@ -102,8 +104,8 @@ TEST(ResourceProviderCallValidationTest, UpdateState)
   EXPECT_SOME(error);
 
   Call::UpdateState* updateState = call.mutable_update_state();
-  updateState->mutable_resource_version_uuid()->set_value(
-      id::UUID::random().toBytes());
+  updateState->mutable_resource_version_uuid()->CopyFrom(
+      protobuf::createUUID());
 
   error = call::validate(call);
   EXPECT_NONE(error);

http://git-wip-us.apache.org/repos/asf/mesos/blob/42848653/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index f76500e..36c72db 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -10196,8 +10196,8 @@ TEST_F(SlaveTest, ResourceProviderReconciliation)
     v1::resource_provider::Call::UpdateState* updateState =
       call.mutable_update_state();
 
-    updateState->mutable_resource_version_uuid()->set_value(
-        resourceVersionUuid.toBytes());
+    updateState->mutable_resource_version_uuid()->CopyFrom(
+        evolve(protobuf::createUUID(resourceVersionUuid)));
     updateState->mutable_resources()->CopyFrom(resourceProviderResources_);
 
     mesos::v1::Operation* _operation = updateState->add_operations();
@@ -10348,8 +10348,8 @@ TEST_F(SlaveTest, RunTaskResourceVersions)
     v1::resource_provider::Call::UpdateState* updateState =
       call.mutable_update_state();
 
-    updateState->mutable_resource_version_uuid()->set_value(
-        id::UUID::random().toBytes());
+    updateState->mutable_resource_version_uuid()->CopyFrom(
+        evolve(protobuf::createUUID()));
     updateState->mutable_resources()->CopyFrom(resourceProviderResources_);
 
     AWAIT_READY(resourceProvider.send(call));