http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index bde93d6..ba9f1f8 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -222,7 +222,7 @@ Slave::Slave(const string& id, qosController(_qosController), secretGenerator(_secretGenerator), authorizer(_authorizer), - resourceVersion(UUID::random()) {} + resourceVersion(id::UUID::random()) {} Slave::~Slave() @@ -1459,7 +1459,7 @@ void Slave::reregistered( taskId, taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Reconciliation: task unknown to the agent", TaskStatus::REASON_RECONCILIATION); @@ -2050,7 +2050,7 @@ void Slave::_run( _task.task_id(), taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Could not launch the task because we failed to unschedule" " directories scheduled for gc", TaskStatus::REASON_GC_ERROR); @@ -2228,7 +2228,7 @@ void Slave::__run( _task.task_id(), TASK_ERROR, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), error->message, reason); @@ -2265,10 +2265,9 @@ void Slave::__run( } } - const hashmap<Option<ResourceProviderID>, UUID> receivedResourceVersions = - protobuf::parseResourceVersions({ - resourceVersionUuids.begin(), - resourceVersionUuids.end()}); + const hashmap<Option<ResourceProviderID>, id::UUID> + receivedResourceVersions = protobuf::parseResourceVersions( + {resourceVersionUuids.begin(), resourceVersionUuids.end()}); foreach (const Option<ResourceProviderID>& resourceProviderId, usedResourceProviderIds) { @@ -2308,7 +2307,7 @@ void Slave::__run( _task.task_id(), taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Tasks assumes outdated resource state", TaskStatus::REASON_INVALID_OFFERS, executorId); @@ -2375,7 +2374,7 @@ void Slave::__run( _task.task_id(), taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "The checkpointed resources being used by the task or task group are " "unknown to the agent", TaskStatus::REASON_RESOURCES_UNKNOWN); @@ -2427,7 +2426,7 @@ void Slave::__run( _task.task_id(), taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "The checkpointed resources being used by the executor are unknown " "to the agent", TaskStatus::REASON_RESOURCES_UNKNOWN, @@ -2530,7 +2529,7 @@ void Slave::__run( _task.task_id(), taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Executor " + executorState, TaskStatus::REASON_EXECUTOR_TERMINATED); @@ -3167,7 +3166,7 @@ void Slave::killTask( task.task_id(), TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "A task within the task group was killed before" " delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, @@ -3181,7 +3180,7 @@ void Slave::killTask( taskId, TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Killed before delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, CHECK_NOTNONE( @@ -3219,7 +3218,7 @@ void Slave::killTask( taskId, taskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Cannot find executor", TaskStatus::REASON_EXECUTOR_TERMINATED); @@ -3246,7 +3245,7 @@ void Slave::killTask( task.task_id(), TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "A task within the task group was killed before" " delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, @@ -3259,7 +3258,7 @@ void Slave::killTask( taskId, TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Killed before delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, executor->id)); @@ -3304,7 +3303,7 @@ void Slave::killTask( task.task_id(), TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Killed before delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, executor->id)); @@ -3316,7 +3315,7 @@ void Slave::killTask( taskId, TASK_KILLED, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Killed before delivery to the executor", TaskStatus::REASON_TASK_KILLED_DURING_LAUNCH, executor->id)); @@ -3808,7 +3807,7 @@ void Slave::applyOfferOperation(const ApplyOfferOperationMessage& message) ? message.framework_id() : Option<FrameworkID>::none(); - Try<UUID> uuid = UUID::fromBytes(message.operation_uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(message.operation_uuid()); if (uuid.isError()) { LOG(ERROR) << "Failed to parse offer operation UUID for operation " << "'" << message.operation_info().id() << "' from " @@ -3906,7 +3905,8 @@ void Slave::reconcileOfferOperations( continue; } - Try<UUID> operationUuid = UUID::fromBytes(operation.operation_uuid()); + Try<id::UUID> operationUuid = + id::UUID::fromBytes(operation.operation_uuid()); CHECK_SOME(operationUuid); // The master reconciles when it notices that an operation is missing from @@ -3976,13 +3976,13 @@ void Slave::statusUpdateAcknowledgement( } taskStatusUpdateManager->acknowledgement( - taskId, frameworkId, UUID::fromBytes(uuid).get()) + taskId, frameworkId, id::UUID::fromBytes(uuid).get()) .onAny(defer(self(), &Slave::_statusUpdateAcknowledgement, lambda::_1, taskId, frameworkId, - UUID::fromBytes(uuid).get())); + id::UUID::fromBytes(uuid).get())); } @@ -3990,7 +3990,8 @@ void Slave::offerOperationUpdateAcknowledgement( const UPID& from, const OfferOperationUpdateAcknowledgementMessage& acknowledgement) { - Try<UUID> operationUuid = UUID::fromBytes(acknowledgement.operation_uuid()); + Try<id::UUID> operationUuid = + id::UUID::fromBytes(acknowledgement.operation_uuid()); CHECK_SOME(operationUuid); OfferOperation* operation = getOfferOperation(operationUuid.get()); @@ -4019,7 +4020,7 @@ void Slave::_statusUpdateAcknowledgement( const Future<bool>& future, const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid) + const id::UUID& uuid) { // The future could fail if this is a duplicate status update acknowledgement. if (!future.isReady()) { @@ -4271,7 +4272,7 @@ void Slave::subscribe( task->task_id(), newTaskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Task launched during agent restart", TaskStatus::REASON_SLAVE_RESTARTED, executor->id); @@ -4616,7 +4617,7 @@ void Slave::reregisterExecutor( task->task_id(), newTaskState, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Task launched during agent restart", TaskStatus::REASON_SLAVE_RESTARTED, executorId); @@ -7139,10 +7140,10 @@ void Slave::handleResourceProviderMessage( // both the known and just received sets. All other offer // operations will be updated via relayed offer operation // status updates. - const hashset<UUID> knownUuids = + const hashset<id::UUID> knownUuids = resourceProvider->offerOperations.keys(); - const hashset<UUID> receivedUuids = + const hashset<id::UUID> receivedUuids = updateState.offerOperations.keys(); // Handle offer operations known to the agent but not reported @@ -7154,7 +7155,7 @@ void Slave::handleResourceProviderMessage( // NOTE: We do not mutate offer operations statuses here; this // would be the responsibility of a offer operation status // update handler. - hashset<UUID> disappearedOperations; + hashset<id::UUID> disappearedOperations; std::set_difference( knownUuids.begin(), knownUuids.end(), @@ -7163,7 +7164,7 @@ void Slave::handleResourceProviderMessage( std::inserter( disappearedOperations, disappearedOperations.begin())); - foreach (const UUID& uuid, disappearedOperations) { + foreach (const id::UUID& uuid, disappearedOperations) { // TODO(bbannier): Instead of simply dropping an operation // with `removeOfferOperation` here we should instead send a // `Reconcile` message with a failed state to the resource @@ -7176,7 +7177,7 @@ void Slave::handleResourceProviderMessage( // Handle offer operations known to the resource provider but // not the agent. This can happen if the agent failed over and // the resource provider reregistered. - hashset<UUID> reappearedOperations; + hashset<id::UUID> reappearedOperations; std::set_difference( receivedUuids.begin(), receivedUuids.end(), @@ -7184,7 +7185,7 @@ void Slave::handleResourceProviderMessage( knownUuids.end(), std::inserter(reappearedOperations, reappearedOperations.begin())); - foreach (const UUID& uuid, reappearedOperations) { + foreach (const id::UUID& uuid, reappearedOperations) { // Start tracking this offer operation. // // NOTE: We do not need to update total resources here as its @@ -7226,7 +7227,8 @@ void Slave::handleResourceProviderMessage( const OfferOperationStatusUpdate& update = message->updateOfferOperationStatus->update; - Try<UUID> operationUUID = UUID::fromBytes(update.operation_uuid()); + Try<id::UUID> operationUUID = + id::UUID::fromBytes(update.operation_uuid()); CHECK_SOME(operationUUID); OfferOperation* operation = getOfferOperation(operationUUID.get()); @@ -7350,7 +7352,7 @@ void Slave::handleResourceProviderMessage( void Slave::addOfferOperation(OfferOperation* operation) { - Try<UUID> uuid = UUID::fromBytes(operation->operation_uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid()); CHECK_SOME(uuid); offerOperations.put(uuid.get(), operation); @@ -7428,7 +7430,8 @@ void Slave::updateOfferOperation( operation->add_statuses()->CopyFrom(status); } - Try<UUID> operationUUID = UUID::fromBytes(operation->operation_uuid()); + Try<id::UUID> operationUUID = + id::UUID::fromBytes(operation->operation_uuid()); CHECK_SOME(operationUUID); LOG(INFO) << "Updating the state of offer operation '" @@ -7488,7 +7491,7 @@ void Slave::updateOfferOperation( void Slave::removeOfferOperation(OfferOperation* operation) { - Try<UUID> uuid = UUID::fromBytes(operation->operation_uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid()); CHECK_SOME(uuid); Result<ResourceProviderID> resourceProviderId = @@ -7515,7 +7518,7 @@ void Slave::removeOfferOperation(OfferOperation* operation) } -OfferOperation* Slave::getOfferOperation(const UUID& uuid) const +OfferOperation* Slave::getOfferOperation(const id::UUID& uuid) const { if (offerOperations.contains(uuid)) { return offerOperations.at(uuid); @@ -7970,7 +7973,7 @@ void Slave::sendExecutorTerminatedStatusUpdate( taskId, state, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), message, reason, executor->id, @@ -8253,7 +8256,7 @@ Executor* Framework::addExecutor(const ExecutorInfo& executorInfo) // ContainerID to create the executor's directory and generate the secret. // Consider fixing this since 'launchExecutor()' is handled asynchronously. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Option<string> user = None(); #ifndef __WINDOWS__ @@ -9033,7 +9036,7 @@ void Executor::recoverTask(const TaskState& state, bool recheckpointTask) CHECK(update.has_uuid()) << "Expecting updates without 'uuid' to have been rejected"; - if (state.acks.contains(UUID::fromBytes(update.uuid()).get())) { + if (state.acks.contains(id::UUID::fromBytes(update.uuid()).get())) { completeTask(state.id); } break; @@ -9164,7 +9167,7 @@ Resources Executor::allocatedResources() const void ResourceProvider::addOfferOperation(OfferOperation* operation) { - Try<UUID> uuid = UUID::fromBytes(operation->operation_uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid()); CHECK_SOME(uuid); CHECK(!offerOperations.contains(uuid.get())) @@ -9176,7 +9179,7 @@ void ResourceProvider::addOfferOperation(OfferOperation* operation) void ResourceProvider::removeOfferOperation(OfferOperation* operation) { - Try<UUID> uuid = UUID::fromBytes(operation->operation_uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid()); CHECK_SOME(uuid); CHECK(offerOperations.contains(uuid.get()))
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/slave.hpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp index de2b2e2..b69c533 100644 --- a/src/slave/slave.hpp +++ b/src/slave/slave.hpp @@ -309,7 +309,7 @@ public: const process::Future<bool>& future, const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid); + const id::UUID& uuid); void executorLaunched( const FrameworkID& frameworkId, @@ -576,7 +576,7 @@ private: void removeOfferOperation(OfferOperation* operation); - OfferOperation* getOfferOperation(const UUID& uuid) const; + OfferOperation* getOfferOperation(const id::UUID& uuid) const; void addResourceProvider(ResourceProvider* resourceProvider); ResourceProvider* getResourceProvider(const ResourceProviderID& id) const; @@ -749,14 +749,14 @@ private: // different resource version UUID than that it maintains, because // this means the operation is operating on resources that might // have already been invalidated. - UUID resourceVersion; + id::UUID resourceVersion; // Keeps track of the following: // (1) Pending operations for resources from the agent. // (2) Pending operations or terminal operations that have // unacknowledged status updates for resource provider // provided resources. - hashmap<UUID, OfferOperation*> offerOperations; + hashmap<id::UUID, OfferOperation*> offerOperations; }; @@ -1059,7 +1059,7 @@ struct ResourceProvider ResourceProvider( const ResourceProviderInfo& _info, const Resources& _totalResources, - const UUID& _resourceVersion) + const id::UUID& _resourceVersion) : info(_info), totalResources(_totalResources), resourceVersion(_resourceVersion) {} @@ -1081,11 +1081,11 @@ struct ResourceProvider // different resource version UUID than that it maintains, because // this means the operation is operating on resources that might // have already been invalidated. - UUID resourceVersion; + id::UUID resourceVersion; // Pending operations or terminal operations that have // unacknowledged status updates. - hashmap<UUID, OfferOperation*> offerOperations; + hashmap<id::UUID, OfferOperation*> offerOperations; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/state.cpp ---------------------------------------------------------------------- diff --git a/src/slave/state.cpp b/src/slave/state.cpp index 3396157..5428b34 100644 --- a/src/slave/state.cpp +++ b/src/slave/state.cpp @@ -662,7 +662,7 @@ Try<TaskState> TaskState::recover( if (record->type() == StatusUpdateRecord::UPDATE) { state.updates.push_back(record->update()); } else { - state.acks.insert(UUID::fromBytes(record->uuid()).get()); + state.acks.insert(id::UUID::fromBytes(record->uuid()).get()); } } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/state.hpp ---------------------------------------------------------------------- diff --git a/src/slave/state.hpp b/src/slave/state.hpp index 8d088d0..aaf8e5c 100644 --- a/src/slave/state.hpp +++ b/src/slave/state.hpp @@ -183,7 +183,7 @@ struct TaskState TaskID id; Option<Task> info; std::vector<StatusUpdate> updates; - hashset<UUID> acks; + hashset<id::UUID> acks; unsigned int errors; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/task_status_update_manager.cpp ---------------------------------------------------------------------- diff --git a/src/slave/task_status_update_manager.cpp b/src/slave/task_status_update_manager.cpp index 1ec6be7..24d803d 100644 --- a/src/slave/task_status_update_manager.cpp +++ b/src/slave/task_status_update_manager.cpp @@ -91,7 +91,7 @@ public: Future<bool> acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid); + const id::UUID& uuid); Future<Nothing> recover( const string& rootDir, @@ -396,7 +396,7 @@ Timeout TaskStatusUpdateManagerProcess::forward( Future<bool> TaskStatusUpdateManagerProcess::acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid) + const id::UUID& uuid) { LOG(INFO) << "Received task status update acknowledgement (UUID: " << uuid << ") for task " << taskId @@ -610,7 +610,7 @@ Future<Nothing> TaskStatusUpdateManager::update( Future<bool> TaskStatusUpdateManager::acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid) + const id::UUID& uuid) { return dispatch( process, @@ -733,7 +733,7 @@ Try<bool> TaskStatusUpdateStream::update(const StatusUpdate& update) // Check that this status update has not already been acknowledged. // This could happen in the rare case when the slave received the ACK // from the framework, died, but slave's ACK to the executor never made it! - if (acknowledged.contains(UUID::fromBytes(update.uuid()).get())) { + if (acknowledged.contains(id::UUID::fromBytes(update.uuid()).get())) { LOG(WARNING) << "Ignoring task status update " << update << " that has already been acknowledged by the framework!"; return false; @@ -742,7 +742,7 @@ Try<bool> TaskStatusUpdateStream::update(const StatusUpdate& update) // Check that this update hasn't already been received. // This could happen if the slave receives a status update from an executor, // then crashes after it writes it to disk but before it sends an ack. - if (received.contains(UUID::fromBytes(update.uuid()).get())) { + if (received.contains(id::UUID::fromBytes(update.uuid()).get())) { LOG(WARNING) << "Ignoring duplicate task status update " << update; return false; } @@ -760,7 +760,7 @@ Try<bool> TaskStatusUpdateStream::update(const StatusUpdate& update) Try<bool> TaskStatusUpdateStream::acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid, + const id::UUID& uuid, const StatusUpdate& update) { if (error.isSome()) { @@ -775,10 +775,10 @@ Try<bool> TaskStatusUpdateStream::acknowledgement( // This might happen if we retried a status update and got back // acknowledgments for both the original and the retried update. - if (uuid != UUID::fromBytes(update.uuid()).get()) { + if (uuid != id::UUID::fromBytes(update.uuid()).get()) { LOG(WARNING) << "Unexpected task status update acknowledgement (received " << uuid << ", expecting " - << UUID::fromBytes(update.uuid()).get() + << id::UUID::fromBytes(update.uuid()).get() << ") for update " << update; return false; } @@ -809,7 +809,7 @@ Result<StatusUpdate> TaskStatusUpdateStream::next() Try<Nothing> TaskStatusUpdateStream::replay( const std::vector<StatusUpdate>& updates, - const hashset<UUID>& acks) + const hashset<id::UUID>& acks) { if (error.isSome()) { return Error(error.get()); @@ -822,7 +822,7 @@ Try<Nothing> TaskStatusUpdateStream::replay( _handle(update, StatusUpdateRecord::UPDATE); // Check if the update has an ACK too. - if (acks.contains(UUID::fromBytes(update.uuid()).get())) { + if (acks.contains(id::UUID::fromBytes(update.uuid()).get())) { _handle(update, StatusUpdateRecord::ACK); } } @@ -876,13 +876,13 @@ void TaskStatusUpdateStream::_handle( if (type == StatusUpdateRecord::UPDATE) { // Record this update. - received.insert(UUID::fromBytes(update.uuid()).get()); + received.insert(id::UUID::fromBytes(update.uuid()).get()); // Add it to the pending updates queue. pending.push(update); } else { // Record this ACK. - acknowledged.insert(UUID::fromBytes(update.uuid()).get()); + acknowledged.insert(id::UUID::fromBytes(update.uuid()).get()); // Remove the corresponding update from the pending queue. pending.pop(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/task_status_update_manager.hpp ---------------------------------------------------------------------- diff --git a/src/slave/task_status_update_manager.hpp b/src/slave/task_status_update_manager.hpp index 6bdb468..3cf5429 100644 --- a/src/slave/task_status_update_manager.hpp +++ b/src/slave/task_status_update_manager.hpp @@ -96,7 +96,7 @@ public: process::Future<bool> acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid); + const id::UUID& uuid); // Recover status updates. process::Future<Nothing> recover( @@ -154,7 +154,7 @@ struct TaskStatusUpdateStream Try<bool> acknowledgement( const TaskID& taskId, const FrameworkID& frameworkId, - const UUID& uuid, + const id::UUID& uuid, const StatusUpdate& update); // Returns the next update (or none, if empty) in the queue. @@ -164,7 +164,7 @@ struct TaskStatusUpdateStream // corresponding ACK, if present. Try<Nothing> replay( const std::vector<StatusUpdate>& updates, - const hashset<UUID>& acks); + const hashset<id::UUID>& acks); // TODO(vinod): Explore semantics to make these private. const bool checkpoint; @@ -193,8 +193,8 @@ private: const Flags flags; - hashset<UUID> received; - hashset<UUID> acknowledged; + hashset<id::UUID> received; + hashset<id::UUID> acknowledged; Option<std::string> path; // File path of the update stream. Option<int_fd> fd; // File descriptor to the update stream. http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/validation.cpp ---------------------------------------------------------------------- diff --git a/src/slave/validation.cpp b/src/slave/validation.cpp index 17cabd1..b7243fc 100644 --- a/src/slave/validation.cpp +++ b/src/slave/validation.cpp @@ -575,7 +575,7 @@ Option<Error> validate(const mesos::executor::Call& call) return Error("Expecting 'uuid' to be present"); } - Try<UUID> uuid = UUID::fromBytes(status.uuid()); + Try<id::UUID> uuid = id::UUID::fromBytes(status.uuid()); if (uuid.isError()) { return uuid.error(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/state/in_memory.cpp ---------------------------------------------------------------------- diff --git a/src/state/in_memory.cpp b/src/state/in_memory.cpp index 2539b4f..f6852e0 100644 --- a/src/state/in_memory.cpp +++ b/src/state/in_memory.cpp @@ -52,12 +52,12 @@ public: return entries.get(name); } - bool set(const Entry& entry, const UUID& uuid) + bool set(const Entry& entry, const id::UUID& uuid) { const Option<Entry>& option = entries.get(entry.name()); if (option.isSome() && - UUID::fromBytes(option.get().uuid()).get() != uuid) { + id::UUID::fromBytes(option.get().uuid()).get() != uuid) { return false; } @@ -73,8 +73,8 @@ public: return false; } - if (UUID::fromBytes(option.get().uuid()).get() != - UUID::fromBytes(entry.uuid()).get()) { + if (id::UUID::fromBytes(option.get().uuid()).get() != + id::UUID::fromBytes(entry.uuid()).get()) { return false; } @@ -115,7 +115,7 @@ Future<Option<Entry>> InMemoryStorage::get(const string& name) } -Future<bool> InMemoryStorage::set(const Entry& entry, const UUID& uuid) +Future<bool> InMemoryStorage::set(const Entry& entry, const id::UUID& uuid) { return dispatch(process, &InMemoryStorageProcess::set, entry, uuid); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/state/leveldb.cpp ---------------------------------------------------------------------- diff --git a/src/state/leveldb.cpp b/src/state/leveldb.cpp index 9ced03a..50d0c7c 100644 --- a/src/state/leveldb.cpp +++ b/src/state/leveldb.cpp @@ -62,7 +62,7 @@ public: // Storage implementation. Future<Option<Entry>> get(const string& name); - Future<bool> set(const Entry& entry, const UUID& uuid); + Future<bool> set(const Entry& entry, const id::UUID& uuid); Future<bool> expunge(const Entry& entry); Future<std::set<string>> names(); @@ -146,7 +146,9 @@ Future<Option<Entry>> LevelDBStorageProcess::get(const string& name) } -Future<bool> LevelDBStorageProcess::set(const Entry& entry, const UUID& uuid) +Future<bool> LevelDBStorageProcess::set( + const Entry& entry, + const id::UUID& uuid) { if (error.isSome()) { return Failure(error.get()); @@ -162,7 +164,7 @@ Future<bool> LevelDBStorageProcess::set(const Entry& entry, const UUID& uuid) } if (option.get().isSome()) { - if (UUID::fromBytes(option.get().get().uuid()).get() != uuid) { + if (id::UUID::fromBytes(option.get().get().uuid()).get() != uuid) { return false; } } @@ -200,8 +202,8 @@ Future<bool> LevelDBStorageProcess::expunge(const Entry& entry) return false; } - if (UUID::fromBytes(option.get().get().uuid()).get() != - UUID::fromBytes(entry.uuid()).get()) { + if (id::UUID::fromBytes(option.get().get().uuid()).get() != + id::UUID::fromBytes(entry.uuid()).get()) { return false; } @@ -294,7 +296,7 @@ Future<Option<Entry>> LevelDBStorage::get(const string& name) } -Future<bool> LevelDBStorage::set(const Entry& entry, const UUID& uuid) +Future<bool> LevelDBStorage::set(const Entry& entry, const id::UUID& uuid) { return dispatch(process, &LevelDBStorageProcess::set, entry, uuid); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/state/log.cpp ---------------------------------------------------------------------- diff --git a/src/state/log.cpp b/src/state/log.cpp index b713839..48d1037 100644 --- a/src/state/log.cpp +++ b/src/state/log.cpp @@ -90,7 +90,7 @@ public: // Storage implementation. Future<Option<Entry>> get(const string& name); - Future<bool> set(const Entry& entry, const UUID& uuid); + Future<bool> set(const Entry& entry, const id::UUID& uuid); Future<bool> expunge(const Entry& entry); Future<std::set<string>> names(); @@ -117,8 +117,8 @@ private: // Continuations. Future<Option<Entry>> _get(const string& name); - Future<bool> _set(const Entry& entry, const UUID& uuid); - Future<bool> __set(const Entry& entry, const UUID& uuid); + Future<bool> _set(const Entry& entry, const id::UUID& uuid); + Future<bool> __set(const Entry& entry, const id::UUID& uuid); Future<bool> ___set( const Entry& entry, size_t diff, @@ -461,7 +461,7 @@ Future<Option<Entry>> LogStorageProcess::_get(const string& name) Future<bool> LogStorageProcess::set( const Entry& entry, - const UUID& uuid) + const id::UUID& uuid) { return mutex.lock() .then(defer(self(), &Self::_set, entry, uuid)) @@ -471,7 +471,7 @@ Future<bool> LogStorageProcess::set( Future<bool> LogStorageProcess::_set( const Entry& entry, - const UUID& uuid) + const id::UUID& uuid) { return start() .then(defer(self(), &Self::__set, entry, uuid)); @@ -480,13 +480,13 @@ Future<bool> LogStorageProcess::_set( Future<bool> LogStorageProcess::__set( const Entry& entry, - const UUID& uuid) + const id::UUID& uuid) { Option<Snapshot> snapshot = snapshots.get(entry.name()); // Check the version first (if we've already got a snapshot). if (snapshot.isSome() && - UUID::fromBytes(snapshot.get().entry.uuid()).get() != uuid) { + id::UUID::fromBytes(snapshot.get().entry.uuid()).get() != uuid) { return false; } @@ -606,8 +606,8 @@ Future<bool> LogStorageProcess::__expunge(const Entry& entry) } // Check the version first. - if (UUID::fromBytes(snapshot.get().entry.uuid()).get() != - UUID::fromBytes(entry.uuid()).get()) { + if (id::UUID::fromBytes(snapshot.get().entry.uuid()).get() != + id::UUID::fromBytes(entry.uuid()).get()) { return false; } @@ -679,7 +679,7 @@ Future<Option<Entry>> LogStorage::get(const string& name) } -Future<bool> LogStorage::set(const Entry& entry, const UUID& uuid) +Future<bool> LogStorage::set(const Entry& entry, const id::UUID& uuid) { return dispatch(process, &LogStorageProcess::set, entry, uuid); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/state/zookeeper.cpp ---------------------------------------------------------------------- diff --git a/src/state/zookeeper.cpp b/src/state/zookeeper.cpp index 1abd816..f992fb9 100644 --- a/src/state/zookeeper.cpp +++ b/src/state/zookeeper.cpp @@ -77,7 +77,7 @@ public: // Storage implementation. Future<Option<Entry>> get(const string& name); - Future<bool> set(const Entry& entry, const UUID& uuid); + Future<bool> set(const Entry& entry, const id::UUID& uuid); virtual Future<bool> expunge(const Entry& entry); Future<std::set<string>> names(); @@ -94,7 +94,7 @@ private: // Helpers for getting the names, fetching, and swapping. Result<std::set<string>> doNames(); Result<Option<Entry>> doGet(const string& name); - Result<bool> doSet(const Entry& entry, const UUID& uuid); + Result<bool> doSet(const Entry& entry, const id::UUID& uuid); Result<bool> doExpunge(const Entry& entry); const string servers; @@ -134,10 +134,11 @@ private: struct Set { - Set(const Entry& _entry, const UUID& _uuid) : entry(_entry), uuid(_uuid) {} + Set(const Entry& _entry, const id::UUID& _uuid) : entry(_entry), uuid(_uuid) + {} Entry entry; - UUID uuid; + id::UUID uuid; Promise<bool> promise; }; @@ -262,7 +263,9 @@ Future<Option<Entry>> ZooKeeperStorageProcess::get(const string& name) } -Future<bool> ZooKeeperStorageProcess::set(const Entry& entry, const UUID& uuid) +Future<bool> ZooKeeperStorageProcess::set( + const Entry& entry, + const id::UUID& uuid) { if (error.isSome()) { return Failure(error.get()); @@ -477,7 +480,7 @@ Result<Option<Entry>> ZooKeeperStorageProcess::doGet(const string& name) Result<bool> ZooKeeperStorageProcess::doSet(const Entry& entry, - const UUID& uuid) + const id::UUID& uuid) { CHECK_NONE(error) << ": " << error.get(); CHECK(state == CONNECTED); @@ -553,7 +556,7 @@ Result<bool> ZooKeeperStorageProcess::doSet(const Entry& entry, return Error("Failed to deserialize Entry"); } - if (UUID::fromBytes(current.uuid()).get() != uuid) { + if (id::UUID::fromBytes(current.uuid()).get() != uuid) { return false; } @@ -604,8 +607,8 @@ Result<bool> ZooKeeperStorageProcess::doExpunge(const Entry& entry) return Error("Failed to deserialize Entry"); } - if (UUID::fromBytes(current.uuid()).get() != - UUID::fromBytes(entry.uuid()).get()) { + if (id::UUID::fromBytes(current.uuid()).get() != + id::UUID::fromBytes(entry.uuid()).get()) { return false; } @@ -652,7 +655,7 @@ Future<Option<Entry>> ZooKeeperStorage::get(const string& name) } -Future<bool> ZooKeeperStorage::set(const Entry& entry, const UUID& uuid) +Future<bool> ZooKeeperStorage::set(const Entry& entry, const id::UUID& uuid) { return dispatch(process, &ZooKeeperStorageProcess::set, entry, uuid); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/status_update_manager/offer_operation.cpp ---------------------------------------------------------------------- diff --git a/src/status_update_manager/offer_operation.cpp b/src/status_update_manager/offer_operation.cpp index 986310e..f27571f 100644 --- a/src/status_update_manager/offer_operation.cpp +++ b/src/status_update_manager/offer_operation.cpp @@ -36,7 +36,7 @@ namespace internal { OfferOperationStatusUpdateManager::OfferOperationStatusUpdateManager() : process( new StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>( "offer-operation-status-update-manager", @@ -55,12 +55,12 @@ OfferOperationStatusUpdateManager::~OfferOperationStatusUpdateManager() void OfferOperationStatusUpdateManager::initialize( const function<void(const OfferOperationStatusUpdate&)>& forward, - const function<const std::string(const UUID&)>& getPath) + const function<const std::string(const id::UUID&)>& getPath) { dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::initialize, forward, @@ -72,13 +72,13 @@ Future<Nothing> OfferOperationStatusUpdateManager::update( const OfferOperationStatusUpdate& update, bool checkpoint) { - Try<UUID> operationUuid = UUID::fromBytes(update.operation_uuid()); + Try<id::UUID> operationUuid = id::UUID::fromBytes(update.operation_uuid()); CHECK_SOME(operationUuid); return dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::update, update, @@ -88,13 +88,13 @@ Future<Nothing> OfferOperationStatusUpdateManager::update( Future<bool> OfferOperationStatusUpdateManager::acknowledgement( - const UUID& operationUuid, - const UUID& statusUuid) + const id::UUID& operationUuid, + const id::UUID& statusUuid) { return dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::acknowledgement, operationUuid, @@ -104,13 +104,13 @@ Future<bool> OfferOperationStatusUpdateManager::acknowledgement( process::Future<OfferOperationStatusManagerState> OfferOperationStatusUpdateManager::recover( - const std::list<UUID>& operationUuids, + const std::list<id::UUID>& operationUuids, bool strict) { return dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::recover, operationUuids, @@ -123,7 +123,7 @@ void OfferOperationStatusUpdateManager::cleanup(const FrameworkID& frameworkId) dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::cleanup, frameworkId); @@ -135,7 +135,7 @@ void OfferOperationStatusUpdateManager::pause() dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::pause); } @@ -146,7 +146,7 @@ void OfferOperationStatusUpdateManager::resume() dispatch( process.get(), &StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::resume); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/status_update_manager/offer_operation.hpp ---------------------------------------------------------------------- diff --git a/src/status_update_manager/offer_operation.hpp b/src/status_update_manager/offer_operation.hpp index e7c2b0c..0ab6be4 100644 --- a/src/status_update_manager/offer_operation.hpp +++ b/src/status_update_manager/offer_operation.hpp @@ -37,7 +37,7 @@ namespace mesos { namespace internal { typedef StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>::State OfferOperationStatusManagerState; @@ -63,7 +63,7 @@ public: // file, given the operation's `operation_uuid`. void initialize( const lambda::function<void(const OfferOperationStatusUpdate&)>& forward, - const lambda::function<const std::string(const UUID&)>& getPath); + const lambda::function<const std::string(const id::UUID&)>& getPath); // Checkpoints the update if necessary and reliably sends the update. // @@ -81,8 +81,8 @@ public: // - `false`: same as above except the status update stream is terminated. // - A `Failure`: if there are any errors (e.g., duplicate, checkpointing). process::Future<bool> acknowledgement( - const UUID& operationUuid, - const UUID& statusUuid); + const id::UUID& operationUuid, + const id::UUID& statusUuid); // Recover status updates. The provided list of operation_uuids is used as the // source of truth for which checkpointed files should be recovered from. @@ -101,7 +101,7 @@ public: // This struct also contains a count of the recoverable errors found during // non-strict recovery. process::Future<OfferOperationStatusManagerState> recover( - const std::list<UUID>& operationUuids, + const std::list<id::UUID>& operationUuids, bool strict); // Closes all the status update streams corresponding to this framework. @@ -120,7 +120,7 @@ public: private: process::Owned< StatusUpdateManagerProcess< - UUID, + id::UUID, OfferOperationStatusUpdateRecord, OfferOperationStatusUpdate>> process; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/status_update_manager/status_update_manager_process.hpp ---------------------------------------------------------------------- diff --git a/src/status_update_manager/status_update_manager_process.hpp b/src/status_update_manager/status_update_manager_process.hpp index 1536bcc..6953852 100644 --- a/src/status_update_manager/status_update_manager_process.hpp +++ b/src/status_update_manager/status_update_manager_process.hpp @@ -245,7 +245,7 @@ public: // `Failure` if there are any errors (e.g., duplicate, checkpointing). process::Future<bool> acknowledgement( const IDType& streamId, - const UUID& uuid) + const id::UUID& uuid) { LOG(INFO) << "Received " << statusUpdateType << " acknowledgement (UUID: " << uuid << ")" @@ -702,7 +702,7 @@ private: if (update.isNone()) { return Error( "Unexpected " + statusUpdateType + " acknowledgment" - " (UUID: " + UUID::fromBytes(record->uuid())->toString() + + " (UUID: " + id::UUID::fromBytes(record->uuid())->toString() + ") for stream " + stringify(streamId)); } stream->_handle(update.get(), record->type()); @@ -784,7 +784,8 @@ private: if (!update.status().has_status_uuid()) { return Error("Status update is missing 'status_uuid'"); } - Try<UUID> statusUuid = UUID::fromBytes(update.status().status_uuid()); + Try<id::UUID> statusUuid = + id::UUID::fromBytes(update.status().status_uuid()); CHECK_SOME(statusUuid); // Check that this status update has not already been acknowledged. @@ -815,7 +816,7 @@ private: // Returns `true`: if the acknowledgement is successfully handled. // `false`: if the acknowledgement is a duplicate. // `Error`: Any errors (e.g., checkpointing). - Try<bool> acknowledgement(const UUID& statusUuid) + Try<bool> acknowledgement(const id::UUID& statusUuid) { if (error.isSome()) { return Error(error.get()); @@ -847,8 +848,8 @@ private: // containing the status update uuid has a different name. In order to // make the `TaskStatusUpdateManager` use this process, we should avoid // depending on identical field names. - Try<UUID> updateStatusUuid = - UUID::fromBytes(update.status().status_uuid()); + Try<id::UUID> updateStatusUuid = + id::UUID::fromBytes(update.status().status_uuid()); CHECK_SOME(updateStatusUuid); // This might happen if we retried a status update and got back @@ -969,7 +970,8 @@ private: // containing the status update uuid has a different name. In order to // make the `TaskStatusUpdateManager` use this process, we should avoid // depending on identical field names. - Try<UUID> statusUuid = UUID::fromBytes(update.status().status_uuid()); + Try<id::UUID> statusUuid = + id::UUID::fromBytes(update.status().status_uuid()); CHECK_SOME(statusUuid); switch (type) { @@ -1003,8 +1005,8 @@ private: const Option<std::string> path; // File path of the update stream. const Option<int_fd> fd; // File descriptor to the update stream. - hashset<UUID> received; - hashset<UUID> acknowledged; + hashset<id::UUID> received; + hashset<id::UUID> acknowledged; Option<std::string> error; // Potential non-retryable error. }; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/agent_container_api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/agent_container_api_tests.cpp b/src/tests/agent_container_api_tests.cpp index 595ce51..c2c15eb 100644 --- a/src/tests/agent_container_api_tests.cpp +++ b/src/tests/agent_container_api_tests.cpp @@ -227,7 +227,7 @@ public: // Launch a standalone parent container. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); v1::agent::Call call; call.set_type(v1::agent::Call::LAUNCH_CONTAINER); @@ -510,7 +510,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentContainerAPITest, NestedContainerLaunch) // Launch a nested container and wait for it to finish. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId.get()); AWAIT_EXPECT_RESPONSE_STATUS_EQ( @@ -554,7 +554,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentContainerAPITest, RecoverNestedContainer) // Launch a nested container. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId.get()); AWAIT_EXPECT_RESPONSE_STATUS_EQ( @@ -608,8 +608,8 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentContainerAPITest, NestedContainerNotFound) AWAIT_READY(slaveRegisteredMessage); v1::ContainerID unknownContainerId; - unknownContainerId.set_value(UUID::random().toString()); - unknownContainerId.mutable_parent()->set_value(UUID::random().toString()); + unknownContainerId.set_value(id::UUID::random().toString()); + unknownContainerId.mutable_parent()->set_value(id::UUID::random().toString()); // Expect a 404 for waiting on unknown containers. AWAIT_EXPECT_RESPONSE_STATUS_EQ( @@ -648,7 +648,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( // Launch a nested container that needs to fetch a URI that // doesn't exist. The launch should therefore fail. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId.get()); mesos::v1::CommandInfo commandInfo; @@ -689,7 +689,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( // the Docker containerizer, even though the parent was made with // the Mesos containerizer. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId.get()); mesos::v1::ContainerInfo containerInfo; @@ -727,7 +727,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( // Launch the first nested container and wait for it to finish. v1::ContainerID childContainerId; - childContainerId.set_value(UUID::random().toString()); + childContainerId.set_value(id::UUID::random().toString()); childContainerId.mutable_parent()->CopyFrom(parentContainerId.get()); AWAIT_EXPECT_RESPONSE_STATUS_EQ( @@ -737,7 +737,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( // Launch the second nested container underneath the first nested contaienr // and wait for it to finish. v1::ContainerID grandchildContainerId; - grandchildContainerId.set_value(UUID::random().toString()); + grandchildContainerId.set_value(id::UUID::random().toString()); grandchildContainerId.mutable_parent()->CopyFrom(childContainerId); AWAIT_EXPECT_RESPONSE_STATUS_EQ( @@ -800,7 +800,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( // Launch a nested container and wait for it to finish. v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(parentContainerId.get()); AWAIT_EXPECT_RESPONSE_STATUS_EQ( http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index dd9305c..86cbba4 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -5059,7 +5059,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); v1::agent::Call call; @@ -5156,7 +5156,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPITest, LaunchNestedContainerSession) ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); string output = "output"; @@ -5277,7 +5277,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); string command = "sleep 1000"; @@ -5375,7 +5375,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); string output = "output"; @@ -5492,7 +5492,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); v1::agent::Call call; @@ -5797,7 +5797,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); { @@ -5998,7 +5998,7 @@ TEST_F(AgentAPITest, HeaderValidation) call.set_type(v1::agent::Call::ATTACH_CONTAINER_OUTPUT); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); call.mutable_attach_container_output()->mutable_container_id() ->CopyFrom(containerId); @@ -6022,7 +6022,7 @@ TEST_F(AgentAPITest, HeaderValidation) // Setting 'Message-Content-Type' header for a non-streaming request. { v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); v1::agent::Call call; call.set_type(v1::agent::Call::ATTACH_CONTAINER_OUTPUT); @@ -6261,7 +6261,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS(AgentAPIStreamingTest, ASSERT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); // Launch the child container with TTY and then attach to it's output. @@ -6511,7 +6511,7 @@ TEST_P_TEMP_DISABLED_ON_WINDOWS( EXPECT_EQ(1u, containerIds->size()); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->set_value(containerIds->begin()->value()); ContentType messageContentType = GetParam(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/container_daemon_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/container_daemon_tests.cpp b/src/tests/container_daemon_tests.cpp index 6e5efc9..c615257 100644 --- a/src/tests/container_daemon_tests.cpp +++ b/src/tests/container_daemon_tests.cpp @@ -125,13 +125,13 @@ TEST_F(ContainerDaemonTest, RestartOnTermination) // containers is to check if the container ID prefix in the claims // of the principal is indeed a prefix of the container ID that is // specified in the API call. - string containerIdPrefix = UUID::random().toString(); + string containerIdPrefix = id::UUID::random().toString(); ContainerID containerId; containerId.set_value(strings::join( "-", containerIdPrefix, - UUID::random().toString())); + id::UUID::random().toString())); Principal principal( None(), @@ -235,11 +235,11 @@ TEST_F(ContainerDaemonTest, FailedAuthorization) // Using two random UUIDs here guarantees that one is not a prefix // of another. Therefore, the authorization will fail. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Principal principal( None(), - {{"cid_prefix", UUID::random().toString()}}); + {{"cid_prefix", id::UUID::random().toString()}}); Future<Secret> secret = secretGenerator->generate(principal); AWAIT_READY(secret); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/composing_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/composing_containerizer_tests.cpp b/src/tests/containerizer/composing_containerizer_tests.cpp index 1eab05c..7c22f16 100644 --- a/src/tests/containerizer/composing_containerizer_tests.cpp +++ b/src/tests/containerizer/composing_containerizer_tests.cpp @@ -292,7 +292,7 @@ TEST_F(ComposingContainerizerTest, DestroyUnknownContainer) ComposingContainerizer containerizer(containerizers); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); AWAIT_EXPECT_FALSE(containerizer.destroy(containerId)); } @@ -313,7 +313,7 @@ TEST_F(ComposingContainerizerTest, WaitUnknownContainer) ComposingContainerizer containerizer(containerizers); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Option<ContainerTermination>> wait = containerizer.wait(containerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp index 629c7a8..630bb2e 100644 --- a/src/tests/containerizer/docker_containerizer_tests.cpp +++ b/src/tests/containerizer/docker_containerizer_tests.cpp @@ -1184,9 +1184,9 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover) SlaveID slaveId; slaveId.set_value("s1"); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerID reapedContainerId; - reapedContainerId.set_value(UUID::random().toString()); + reapedContainerId.set_value(id::UUID::random().toString()); string container1 = containerName(containerId); string container2 = containerName(reapedContainerId); @@ -1317,10 +1317,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_KillOrphanContainers) slaveId.set_value("s1"); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerID orphanContainerId; - orphanContainerId.set_value(UUID::random().toString()); + orphanContainerId.set_value(id::UUID::random().toString()); string container1 = containerName(containerId); @@ -1451,10 +1451,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SkipRecoverNonDocker) docker); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorID executorId; - executorId.set_value(UUID::random().toString()); + executorId.set_value(id::UUID::random().toString()); ExecutorInfo executorInfo; executorInfo.mutable_container()->set_type(ContainerInfo::MESOS); @@ -1472,7 +1472,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SkipRecoverNonDocker) SlaveState slaveState; FrameworkID frameworkId; - frameworkId.set_value(UUID::random().toString()); + frameworkId.set_value(id::UUID::random().toString()); slaveState.frameworks.put(frameworkId, frameworkState); Future<Nothing> recover = dockerContainerizer.recover(slaveState); @@ -2139,7 +2139,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs) task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(offer.resources()); - string uuid = UUID::random().toString(); + string uuid = id::UUID::random().toString(); // NOTE: We prefix `echo` with `unbuffer` so that we can immediately // flush the output of `echo`. This mitigates a race in Docker where @@ -2420,7 +2420,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override) task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(offer.resources()); - string uuid = UUID::random().toString(); + string uuid = id::UUID::random().toString(); CommandInfo command; command.set_shell(false); @@ -2562,7 +2562,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args) task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(offer.resources()); - string uuid = UUID::random().toString(); + string uuid = id::UUID::random().toString(); CommandInfo command; command.set_shell(false); @@ -3094,7 +3094,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping) containerId.get(), ContainerState::RUNNING)); - string uuid = UUID::random().toString(); + string uuid = id::UUID::random().toString(); // Write uuid to docker mapped host port. Try<process::Subprocess> s = process::subprocess( @@ -3494,7 +3494,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyUnknownContainer) DockerContainerizer* containerizer = create.get(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); AWAIT_EXPECT_FALSE(containerizer->destroy(containerId)); } @@ -3978,7 +3978,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_WaitUnknownContainer) DockerContainerizer* containerizer = create.get(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Option<ContainerTermination>> wait = containerizer->wait(containerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/io_switchboard_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/io_switchboard_tests.cpp b/src/tests/containerizer/io_switchboard_tests.cpp index fe9643a..f217d02 100644 --- a/src/tests/containerizer/io_switchboard_tests.cpp +++ b/src/tests/containerizer/io_switchboard_tests.cpp @@ -317,7 +317,7 @@ TEST_F(IOSwitchboardServerTest, AttachOutput) Future<Nothing> runServer = server.get()->run(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<unix::Address> address = unix::Address::create(socketPath); ASSERT_SOME(address); @@ -395,7 +395,7 @@ TEST_F(IOSwitchboardServerTest, SendHeartbeat) call.set_type(Call::ATTACH_CONTAINER_OUTPUT); Call::AttachContainerOutput* attach = call.mutable_attach_container_output(); - attach->mutable_container_id()->set_value(UUID::random().toString()); + attach->mutable_container_id()->set_value(id::UUID::random().toString()); http::Request request; request.method = "POST"; @@ -550,7 +550,7 @@ TEST_F(IOSwitchboardServerTest, AttachInput) Call::AttachContainerInput* attach = call.mutable_attach_container_input(); attach->set_type(Call::AttachContainerInput::CONTAINER_ID); - attach->mutable_container_id()->set_value(UUID::random().toString()); + attach->mutable_container_id()->set_value(id::UUID::random().toString()); writer.write(encoder.encode(call)); @@ -660,7 +660,7 @@ TEST_F(IOSwitchboardServerTest, ReceiveHeartbeat) Call::AttachContainerInput* attach = call.mutable_attach_container_input(); attach->set_type(Call::AttachContainerInput::CONTAINER_ID); - attach->mutable_container_id()->set_value(UUID::random().toString()); + attach->mutable_container_id()->set_value(id::UUID::random().toString()); writer.write(encoder.encode(call)); @@ -729,7 +729,7 @@ TEST_F(IOSwitchboardTest, ContainerAttach) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -791,7 +791,7 @@ TEST_F(IOSwitchboardTest, OutputRedirectionWithTTY) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -852,7 +852,7 @@ TEST_F(IOSwitchboardTest, KillSwitchboardContainerDestroyed) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -872,7 +872,7 @@ TEST_F(IOSwitchboardTest, KillSwitchboardContainerDestroyed) ContainerID childContainerId; childContainerId.mutable_parent()->CopyFrom(containerId); - childContainerId.set_value(UUID::random().toString()); + childContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( childContainerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp index b341a86..bdc3619 100644 --- a/src/tests/containerizer/isolator_tests.cpp +++ b/src/tests/containerizer/isolator_tests.cpp @@ -66,7 +66,7 @@ public: MesosTest::SetUp(); directory = os::getcwd(); // We're inside a temporary sandbox. - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); } Try<Owned<MesosContainerizer>> createContainerizer( http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/linux_filesystem_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp index 4d796a8..bf04711 100644 --- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp +++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp @@ -95,7 +95,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_ChangeRootFilesystem) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -146,7 +146,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_Metrics) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a long running task so we can reliably capture the moment it's alive. ExecutorInfo executor = createExecutorInfo( @@ -206,7 +206,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithRootFilesystem) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -277,7 +277,7 @@ TEST_F(LinuxFilesystemIsolatorTest, Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Write to an absolute path in the container's mount namespace to // verify mounts of the SANDBOX_PATH volume and the persistent @@ -349,7 +349,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeWithoutRootFilesystem) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -415,10 +415,10 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_MultipleContainers) Owned<Containerizer> containerizer(create.get()); ContainerID containerId1; - containerId1.set_value(UUID::random().toString()); + containerId1.set_value(id::UUID::random().toString()); ContainerID containerId2; - containerId2.set_value(UUID::random().toString()); + containerId2.set_value(id::UUID::random().toString()); ExecutorInfo executor1 = createExecutorInfo( "test_executor1", @@ -593,7 +593,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_PersistentVolumeMountPointCleanup) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/mesos_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp index 98adcfc..0729464 100644 --- a/src/tests/containerizer/mesos_containerizer_tests.cpp +++ b/src/tests/containerizer/mesos_containerizer_tests.cpp @@ -125,7 +125,7 @@ TEST_F(MesosContainerizerTest, Launch) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -173,7 +173,7 @@ TEST_F(MesosContainerizerTest, StandaloneLaunch) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launch = containerizer->launch( containerId, @@ -218,7 +218,7 @@ TEST_F(MesosContainerizerTest, Destroy) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -270,7 +270,7 @@ TEST_F(MesosContainerizerTest, StatusWithContainerID) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -373,7 +373,7 @@ TEST_F(MesosContainerizerIsolatorPreparationTest, ScriptSucceeds) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launch = containerizer->launch( containerId, @@ -420,7 +420,7 @@ TEST_F(MesosContainerizerIsolatorPreparationTest, ScriptFails) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launch = containerizer->launch( containerId, @@ -479,7 +479,7 @@ TEST_F(MesosContainerizerIsolatorPreparationTest, MultipleScripts) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launch = containerizer->launch( containerId, @@ -538,7 +538,7 @@ TEST_F(MesosContainerizerIsolatorPreparationTest, ExecutorEnvironmentVariable) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Ensure that LIBPROCESS_IP has been passed despite the explicit // specification of the environment. If so, then touch the test file. @@ -614,7 +614,7 @@ TEST_F(MesosContainerizerExecuteTest, IoRedirection) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); string errMsg = "this is stderr"; string outMsg = "this is stdout"; @@ -671,7 +671,7 @@ TEST_F(MesosContainerizerExecuteTest, ROOT_SandboxFileOwnership) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); const string user = "nobody"; @@ -755,7 +755,7 @@ TEST_F(MesosContainerizerDestroyTest, DestroyWhileFetching) Return(promise.future()))); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); SlaveID slaveId = SlaveID(); slaveId.set_value("slave_id"); @@ -824,7 +824,7 @@ TEST_F(MesosContainerizerDestroyTest, DestroyWhilePreparing) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); SlaveID slaveId = SlaveID(); slaveId.set_value("slave_id"); @@ -883,7 +883,7 @@ TEST_F(MesosContainerizerDestroyTest, DestroyUnknownContainer) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); AWAIT_EXPECT_FALSE(containerizer->destroy(containerId)); } @@ -945,12 +945,12 @@ TEST_F(MesosContainerizerProvisionerTest, ProvisionFailed) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Image image; image.set_type(Image::DOCKER); Image::Docker dockerImage; - dockerImage.set_name(UUID::random().toString()); + dockerImage.set_name(id::UUID::random().toString()); image.mutable_docker()->CopyFrom(dockerImage); ContainerInfo::MesosInfo mesosInfo; @@ -1031,12 +1031,12 @@ TEST_F(MesosContainerizerProvisionerTest, DestroyWhileProvisioning) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Image image; image.set_type(Image::DOCKER); Image::Docker dockerImage; - dockerImage.set_name(UUID::random().toString()); + dockerImage.set_name(id::UUID::random().toString()); image.mutable_docker()->CopyFrom(dockerImage); ContainerInfo::MesosInfo mesosInfo; @@ -1123,12 +1123,12 @@ TEST_F(MesosContainerizerProvisionerTest, IsolatorCleanupBeforePrepare) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Image image; image.set_type(Image::DOCKER); Image::Docker dockerImage; - dockerImage.set_name(UUID::random().toString()); + dockerImage.set_name(id::UUID::random().toString()); image.mutable_docker()->CopyFrom(dockerImage); ContainerInfo::MesosInfo mesosInfo; @@ -1212,7 +1212,7 @@ TEST_F(MesosContainerizerDestroyTest, LauncherDestroyFailure) Owned<MesosContainerizer> containerizer(_containerizer.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); SlaveID slaveId = SlaveID(); slaveId.set_value("slave_id"); @@ -1280,10 +1280,10 @@ TEST_F(MesosContainerizerRecoverTest, SkipRecoverNonMesosContainers) Owned<MesosContainerizer> containerizer(create.get()); ExecutorID executorId; - executorId.set_value(UUID::random().toString()); + executorId.set_value(id::UUID::random().toString()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executorInfo; executorInfo.mutable_container()->set_type(ContainerInfo::DOCKER); @@ -1301,7 +1301,7 @@ TEST_F(MesosContainerizerRecoverTest, SkipRecoverNonMesosContainers) SlaveState slaveState; FrameworkID frameworkId; - frameworkId.set_value(UUID::random().toString()); + frameworkId.set_value(id::UUID::random().toString()); slaveState.frameworks.put(frameworkId, frameworkState); Future<Nothing> recover = containerizer->recover(slaveState); @@ -1327,9 +1327,9 @@ TEST_F(MesosLauncherStatusTest, ExecutorPIDTest) ASSERT_SOME(launcher); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerID invalidContainerId; - invalidContainerId.set_value(UUID::random().toString()); + invalidContainerId.set_value(id::UUID::random().toString()); Try<pid_t> forked = launcher.get()->fork( containerId, @@ -1380,7 +1380,7 @@ TEST_F(MesosContainerizerWaitTest, WaitUnknownContainer) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<Option<ContainerTermination>> wait = containerizer->wait(containerId);
