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 2017/12/14 16:36:43 UTC
[1/6] mesos git commit: Stout: Used a namespace for UUID.
Repository: mesos
Updated Branches:
refs/heads/master ae9d1033b -> 605b238d6
Stout: Used a namespace for UUID.
To avoid conflicts when introducing a UUID type in Mesos' namespace,
Stout's UUID type is put in the 'id' namespace.
Review: https://reviews.apache.org/r/64380/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/23d76def
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/23d76def
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/23d76def
Branch: refs/heads/master
Commit: 23d76defdf88a2d8d954dbe69559a005b72c4795
Parents: 7467c81
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Thu Dec 14 17:29:33 2017 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Dec 14 17:32:48 2017 +0100
----------------------------------------------------------------------
3rdparty/stout/include/stout/uuid.hpp | 12 ++----------
3rdparty/stout/tests/os/filesystem_tests.cpp | 24 ++++++++++++++---------
3rdparty/stout/tests/os_tests.cpp | 12 ++++++------
3rdparty/stout/tests/protobuf_tests.cpp | 2 +-
3rdparty/stout/tests/uuid_tests.cpp | 2 ++
5 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d76def/3rdparty/stout/include/stout/uuid.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/uuid.hpp b/3rdparty/stout/include/stout/uuid.hpp
index 1683084..0d0fd3a 100644
--- a/3rdparty/stout/include/stout/uuid.hpp
+++ b/3rdparty/stout/include/stout/uuid.hpp
@@ -30,11 +30,6 @@
#include <stout/windows.hpp>
#endif // __WINDOWS__
-// NOTE: This namespace is necessary because the standard Windows headers
-// define a UUID struct in the global namespace for the DCE RPC API. We put
-// this in the `id::` namespace to avoid collisions. Note also that we include
-// a line below, `using id::UUID`, which allows us to avoid being forced to
-// change most of the callsites that use `UUID` to use `id::UUID` instead.
namespace id {
struct UUID : boost::uuids::uuid
@@ -101,17 +96,14 @@ private:
} // namespace id {
-// NOTE: see comment for the line `namespace id {`, near the top of the file.
-using id::UUID;
-
namespace std {
template <>
-struct hash<UUID>
+struct hash<id::UUID>
{
typedef size_t result_type;
- typedef UUID argument_type;
+ typedef id::UUID argument_type;
result_type operator()(const argument_type& uuid) const
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d76def/3rdparty/stout/tests/os/filesystem_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os/filesystem_tests.cpp b/3rdparty/stout/tests/os/filesystem_tests.cpp
index 57e1dc1..2204d10 100644
--- a/3rdparty/stout/tests/os/filesystem_tests.cpp
+++ b/3rdparty/stout/tests/os/filesystem_tests.cpp
@@ -61,7 +61,8 @@ class FsTest : public TemporaryDirectoryTest {};
TEST_F(FsTest, Find)
{
- const string testdir = path::join(os::getcwd(), UUID::random().toString());
+ const string testdir =
+ path::join(os::getcwd(), id::UUID::random().toString());
const string subdir = path::join(testdir, "test1");
ASSERT_SOME(os::mkdir(subdir)); // Create the directories.
@@ -91,7 +92,8 @@ TEST_F(FsTest, Find)
TEST_F(FsTest, ReadWriteString)
{
- const string testfile = path::join(os::getcwd(), UUID::random().toString());
+ const string testfile =
+ path::join(os::getcwd(), id::UUID::random().toString());
const string teststr = "line1\nline2";
ASSERT_SOME(os::write(testfile, teststr));
@@ -174,7 +176,8 @@ TEST_F(FsTest, Exists)
TEST_F(FsTest, Touch)
{
- const string testfile = path::join(os::getcwd(), UUID::random().toString());
+ const string testfile =
+ path::join(os::getcwd(), id::UUID::random().toString());
ASSERT_SOME(os::touch(testfile));
ASSERT_TRUE(os::exists(testfile));
@@ -243,7 +246,7 @@ TEST_F(FsTest, CreateDirectoryLongerThanMaxPath)
{
string testdir = sandbox.get();
while (testdir.length() <= MAX_PATH) {
- testdir = path::join(testdir, UUID::random().toString());
+ testdir = path::join(testdir, id::UUID::random().toString());
}
EXPECT_TRUE(testdir.length() > MAX_PATH);
@@ -263,7 +266,7 @@ TEST_F(FsTest, SYMLINK_Symlink)
{
const string temp_path = os::getcwd();
const string link = path::join(temp_path, "sym.link");
- const string file = path::join(temp_path, UUID::random().toString());
+ const string file = path::join(temp_path, id::UUID::random().toString());
// Create file
ASSERT_SOME(os::touch(file))
@@ -340,7 +343,8 @@ TEST_F(FsTest, SYMLINK_Rm)
TEST_F(FsTest, List)
{
- const string testdir = path::join(os::getcwd(), UUID::random().toString());
+ const string testdir =
+ path::join(os::getcwd(), id::UUID::random().toString());
ASSERT_SOME(os::mkdir(testdir)); // Create the directories.
// Now write some files.
@@ -376,7 +380,8 @@ TEST_F(FsTest, List)
TEST_F(FsTest, Rename)
{
- const string testdir = path::join(os::getcwd(), UUID::random().toString());
+ const string testdir =
+ path::join(os::getcwd(), id::UUID::random().toString());
ASSERT_SOME(os::mkdir(testdir)); // Create the directories.
// Now write some files.
@@ -442,7 +447,8 @@ TEST_F(FsTest, Close)
const int previous_report_mode = _CrtSetReportMode(_CRT_ASSERT, 0);
#endif // __WINDOWS__
- const string testfile = path::join(os::getcwd(), UUID::random().toString());
+ const string testfile =
+ path::join(os::getcwd(), id::UUID::random().toString());
ASSERT_SOME(os::touch(testfile));
ASSERT_TRUE(os::exists(testfile));
@@ -523,7 +529,7 @@ TEST_F(FsTest, Close)
#if defined(__linux__) || defined(__APPLE__)
TEST_F(FsTest, Xattr)
{
- const string file = path::join(os::getcwd(), UUID::random().toString());
+ const string file = path::join(os::getcwd(), id::UUID::random().toString());
// Create file.
ASSERT_SOME(os::touch(file));
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d76def/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os_tests.cpp b/3rdparty/stout/tests/os_tests.cpp
index 02f2a18..de41077 100644
--- a/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/stout/tests/os_tests.cpp
@@ -216,7 +216,7 @@ TEST_F(OsTest, Nonblock)
// non-existing file.
TEST_F(OsTest, SYMLINK_Size)
{
- const string file = path::join(os::getcwd(), UUID::random().toString());
+ const string file = path::join(os::getcwd(), id::UUID::random().toString());
const Bytes size = 1053;
@@ -231,7 +231,7 @@ TEST_F(OsTest, SYMLINK_Size)
EXPECT_ERROR(os::stat::size("aFileThatDoesNotExist"));
- const string link = path::join(os::getcwd(), UUID::random().toString());
+ const string link = path::join(os::getcwd(), id::UUID::random().toString());
ASSERT_SOME(fs::symlink(file, link));
@@ -724,15 +724,15 @@ TEST_F(OsTest, User)
// A random UUID is an invalid username on some platforms. Some
// versions of Linux (e.g., RHEL7) treat invalid usernames
// differently from valid-but-not-found usernames.
- EXPECT_NONE(os::getuid(UUID::random().toString()));
- EXPECT_NONE(os::getgid(UUID::random().toString()));
+ EXPECT_NONE(os::getuid(id::UUID::random().toString()));
+ EXPECT_NONE(os::getgid(id::UUID::random().toString()));
// A username that is valid but that is unlikely to exist.
EXPECT_NONE(os::getuid("zzzvaliduserzzz"));
EXPECT_NONE(os::getgid("zzzvaliduserzzz"));
EXPECT_SOME(os::su(user.get()));
- EXPECT_ERROR(os::su(UUID::random().toString()));
+ EXPECT_ERROR(os::su(id::UUID::random().toString()));
Try<string> gids_ = os::shell("id -G " + user.get());
EXPECT_SOME(gids_);
@@ -1009,7 +1009,7 @@ TEST_F(OsTest, SYMLINK_Realpath)
const string& testFile = _testFile.get();
// Create a symlink pointing to a file.
- const string testLink = UUID::random().toString();
+ const string testLink = id::UUID::random().toString();
ASSERT_SOME(fs::symlink(testFile, testLink));
// Validate the symlink.
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d76def/3rdparty/stout/tests/protobuf_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/protobuf_tests.cpp b/3rdparty/stout/tests/protobuf_tests.cpp
index 543f96c..be35ad0 100644
--- a/3rdparty/stout/tests/protobuf_tests.cpp
+++ b/3rdparty/stout/tests/protobuf_tests.cpp
@@ -148,7 +148,7 @@ TEST(ProtobufTest, JSON)
// Modify the message to test (de-)serialization of random bytes generated
// by UUID.
- message.set_bytes(UUID::random().toBytes());
+ message.set_bytes(id::UUID::random().toBytes());
object = JSON::protobuf(message);
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d76def/3rdparty/stout/tests/uuid_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/uuid_tests.cpp b/3rdparty/stout/tests/uuid_tests.cpp
index 1fbd623..31cc016 100644
--- a/3rdparty/stout/tests/uuid_tests.cpp
+++ b/3rdparty/stout/tests/uuid_tests.cpp
@@ -20,6 +20,8 @@
#include <stout/gtest.hpp>
#include <stout/uuid.hpp>
+using id::UUID;
+
using std::string;
[5/6] mesos git commit: Mesos: Used a namespace for UUID.
Posted by bb...@apache.org.
Mesos: Used a namespace for UUID.
To avoid conflicts when introducing a UUID type in Mesos' namespace,
Stout's UUID type is put in the 'id' namespace.
Review: https://reviews.apache.org/r/64381/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7467c810
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7467c810
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7467c810
Branch: refs/heads/master
Commit: 7467c810ac3fc315482f04a08abcf9bb1d5d8c37
Parents: ae9d103
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Thu Dec 14 17:28:46 2017 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Dec 14 17:32:48 2017 +0100
----------------------------------------------------------------------
include/mesos/state/in_memory.hpp | 2 +-
include/mesos/state/leveldb.hpp | 2 +-
include/mesos/state/log.hpp | 2 +-
include/mesos/state/state.hpp | 6 +-
include/mesos/state/storage.hpp | 2 +-
include/mesos/state/zookeeper.hpp | 2 +-
src/checks/checker_process.cpp | 2 +-
src/common/protobuf_utils.cpp | 26 ++---
src/common/protobuf_utils.hpp | 16 +--
src/examples/long_lived_executor.cpp | 6 +-
src/examples/persistent_volume_framework.cpp | 6 +-
src/examples/test_http_executor.cpp | 6 +-
src/exec/exec.cpp | 16 +--
src/executor/executor.cpp | 12 +--
src/launcher/default_executor.cpp | 32 +++---
src/launcher/executor.cpp | 14 +--
src/master/http.cpp | 4 +-
src/master/master.cpp | 99 ++++++++---------
src/master/master.hpp | 30 +++---
src/master/validation.cpp | 4 +-
src/messages/messages.cpp | 7 +-
src/resource_provider/daemon.cpp | 12 +--
src/resource_provider/http_connection.hpp | 18 ++--
src/resource_provider/manager.cpp | 24 ++---
src/resource_provider/message.hpp | 8 +-
src/sched/sched.cpp | 8 +-
src/scheduler/scheduler.cpp | 18 ++--
src/slave/containerizer/docker.cpp | 2 +-
.../containerizer/mesos/io/switchboard.cpp | 2 +-
.../mesos/isolators/volume/secret.cpp | 4 +-
.../mesos/provisioner/provisioner.cpp | 2 +-
src/slave/paths.cpp | 8 +-
src/slave/paths.hpp | 6 +-
src/slave/slave.cpp | 89 +++++++--------
src/slave/slave.hpp | 14 +--
src/slave/state.cpp | 2 +-
src/slave/state.hpp | 2 +-
src/slave/task_status_update_manager.cpp | 24 ++---
src/slave/task_status_update_manager.hpp | 10 +-
src/slave/validation.cpp | 2 +-
src/state/in_memory.cpp | 10 +-
src/state/leveldb.cpp | 14 +--
src/state/log.cpp | 20 ++--
src/state/zookeeper.cpp | 23 ++--
src/status_update_manager/offer_operation.cpp | 26 ++---
src/status_update_manager/offer_operation.hpp | 12 +--
.../status_update_manager_process.hpp | 20 ++--
src/tests/agent_container_api_tests.cpp | 20 ++--
src/tests/api_tests.cpp | 20 ++--
src/tests/container_daemon_tests.cpp | 8 +-
.../composing_containerizer_tests.cpp | 4 +-
.../docker_containerizer_tests.cpp | 26 ++---
.../containerizer/io_switchboard_tests.cpp | 16 +--
src/tests/containerizer/isolator_tests.cpp | 2 +-
.../linux_filesystem_isolator_tests.cpp | 16 +--
.../containerizer/mesos_containerizer_tests.cpp | 52 ++++-----
.../nested_mesos_containerizer_tests.cpp | 108 +++++++++----------
src/tests/containerizer/port_mapping_tests.cpp | 28 ++---
.../containerizer/provisioner_appc_tests.cpp | 14 +--
.../containerizer/provisioner_docker_tests.cpp | 4 +-
.../containerizer/runtime_isolator_tests.cpp | 6 +-
.../volume_host_path_isolator_tests.cpp | 10 +-
.../volume_image_isolator_tests.cpp | 8 +-
.../volume_sandbox_path_isolator_tests.cpp | 14 +--
.../volume_secret_isolator_tests.cpp | 4 +-
src/tests/fault_tolerance_tests.cpp | 4 +-
src/tests/fetcher_tests.cpp | 50 ++++-----
src/tests/master_tests.cpp | 6 +-
src/tests/master_validation_tests.cpp | 20 ++--
src/tests/mesos.cpp | 3 +-
src/tests/mesos.hpp | 12 +--
...er_operation_status_update_manager_tests.cpp | 72 ++++++-------
src/tests/partition_tests.cpp | 32 +++---
src/tests/paths_tests.cpp | 2 +-
src/tests/reconciliation_tests.cpp | 16 +--
src/tests/registrar_tests.cpp | 2 +-
src/tests/resource_provider_manager_tests.cpp | 24 +++--
.../resource_provider_validation_tests.cpp | 12 +--
src/tests/scheduler_event_call_tests.cpp | 3 +-
src/tests/scheduler_http_api_tests.cpp | 2 +-
src/tests/slave_authorization_tests.cpp | 10 +-
src/tests/slave_recovery_tests.cpp | 2 +-
src/tests/slave_tests.cpp | 12 +--
src/tests/slave_validation_tests.cpp | 24 ++---
src/tests/task_status_update_manager_tests.cpp | 2 +-
85 files changed, 685 insertions(+), 661 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/in_memory.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/in_memory.hpp b/include/mesos/state/in_memory.hpp
index 2032742..3fcf462 100644
--- a/include/mesos/state/in_memory.hpp
+++ b/include/mesos/state/in_memory.hpp
@@ -45,7 +45,7 @@ public:
const std::string& name);
virtual process::Future<bool> set(
const internal::state::Entry& entry,
- const UUID& uuid);
+ const id::UUID& uuid);
virtual process::Future<bool> expunge(const internal::state::Entry& entry);
virtual process::Future<std::set<std::string>> names();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/leveldb.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/leveldb.hpp b/include/mesos/state/leveldb.hpp
index 6c732d3..265e08b 100644
--- a/include/mesos/state/leveldb.hpp
+++ b/include/mesos/state/leveldb.hpp
@@ -46,7 +46,7 @@ public:
const std::string& name);
virtual process::Future<bool> set(
const internal::state::Entry& entry,
- const UUID& uuid);
+ const id::UUID& uuid);
virtual process::Future<bool> expunge(const internal::state::Entry& entry);
virtual process::Future<std::set<std::string>> names();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/log.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/log.hpp b/include/mesos/state/log.hpp
index ac0312f..54cbdc8 100644
--- a/include/mesos/state/log.hpp
+++ b/include/mesos/state/log.hpp
@@ -48,7 +48,7 @@ public:
const std::string& name);
virtual process::Future<bool> set(
const internal::state::Entry& entry,
- const UUID& uuid);
+ const id::UUID& uuid);
virtual process::Future<bool> expunge(const internal::state::Entry& entry);
virtual process::Future<std::set<std::string>> names();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/state.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/state.hpp b/include/mesos/state/state.hpp
index 8f7f3ad..eb42c0e 100644
--- a/include/mesos/state/state.hpp
+++ b/include/mesos/state/state.hpp
@@ -143,7 +143,7 @@ inline process::Future<Variable> State::_fetch(
// UUID and no value to start).
internal::state::Entry entry;
entry.set_name(name);
- entry.set_uuid(UUID::random().toBytes());
+ entry.set_uuid(id::UUID::random().toBytes());
return Variable(entry);
}
@@ -152,13 +152,13 @@ inline process::Future<Variable> State::_fetch(
inline process::Future<Option<Variable>> State::store(const Variable& variable)
{
// Note that we try and swap an entry even if the value didn't change!
- UUID uuid = UUID::fromBytes(variable.entry.uuid()).get();
+ id::UUID uuid = id::UUID::fromBytes(variable.entry.uuid()).get();
// Create a new entry to replace the existing entry provided the
// UUID matches.
internal::state::Entry entry;
entry.set_name(variable.entry.name());
- entry.set_uuid(UUID::random().toBytes());
+ entry.set_uuid(id::UUID::random().toBytes());
entry.set_value(variable.entry.value());
return storage->set(entry, uuid)
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/storage.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/storage.hpp b/include/mesos/state/storage.hpp
index 2bfa047..c1ff390 100644
--- a/include/mesos/state/storage.hpp
+++ b/include/mesos/state/storage.hpp
@@ -44,7 +44,7 @@ public:
const std::string& name) = 0;
virtual process::Future<bool> set(
const internal::state::Entry& entry,
- const UUID& uuid) = 0;
+ const id::UUID& uuid) = 0;
// Returns true if successfully expunged the variable from the state.
virtual process::Future<bool> expunge(
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/include/mesos/state/zookeeper.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/state/zookeeper.hpp b/include/mesos/state/zookeeper.hpp
index 8d8c19c..fee9398 100644
--- a/include/mesos/state/zookeeper.hpp
+++ b/include/mesos/state/zookeeper.hpp
@@ -53,7 +53,7 @@ public:
const std::string& name);
virtual process::Future<bool> set(
const internal::state::Entry& entry,
- const UUID& uuid);
+ const id::UUID& uuid);
virtual process::Future<bool> expunge(const internal::state::Entry& entry);
virtual process::Future<std::set<std::string>> names();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/checks/checker_process.cpp
----------------------------------------------------------------------
diff --git a/src/checks/checker_process.cpp b/src/checks/checker_process.cpp
index 496bd41..ddb197b 100644
--- a/src/checks/checker_process.cpp
+++ b/src/checks/checker_process.cpp
@@ -545,7 +545,7 @@ void CheckerProcess::__nestedCommandCheck(
http::Connection connection)
{
ContainerID checkContainerId;
- checkContainerId.set_value("check-" + UUID::random().toString());
+ checkContainerId.set_value("check-" + id::UUID::random().toString());
checkContainerId.mutable_parent()->CopyFrom(taskContainerId.get());
previousCheckContainerId = checkContainerId;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 3bc72e4..3bd5bae 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -107,7 +107,7 @@ StatusUpdate createStatusUpdate(
const TaskID& taskId,
const TaskState& state,
const TaskStatus::Source& source,
- const Option<UUID>& uuid,
+ const Option<id::UUID>& uuid,
const string& message,
const Option<TaskStatus::Reason>& reason,
const Option<ExecutorID>& executorId,
@@ -234,7 +234,7 @@ StatusUpdate createStatusUpdate(
TaskStatus createTaskStatus(
const TaskID& taskId,
const TaskState& state,
- const UUID& uuid,
+ const id::UUID& uuid,
double timestamp)
{
TaskStatus status;
@@ -250,7 +250,7 @@ TaskStatus createTaskStatus(
TaskStatus createTaskStatus(
TaskStatus status,
- const UUID& uuid,
+ const id::UUID& uuid,
double timestamp,
const Option<TaskState>& state,
const Option<string>& message,
@@ -420,7 +420,7 @@ OfferOperationStatus createOfferOperationStatus(
const Option<OfferOperationID>& operationId,
const Option<string>& message,
const Option<Resources>& convertedResources,
- const Option<UUID>& statusUUID)
+ const Option<id::UUID>& statusUUID)
{
OfferOperationStatus status;
status.set_state(state);
@@ -450,7 +450,7 @@ OfferOperation createOfferOperation(
const OfferOperationStatus& latestStatus,
const Option<FrameworkID>& frameworkId,
const Option<SlaveID>& slaveId,
- const Option<UUID>& operationUUID)
+ const Option<id::UUID>& operationUUID)
{
OfferOperation operation;
if (frameworkId.isSome()) {
@@ -464,7 +464,7 @@ OfferOperation createOfferOperation(
if (operationUUID.isSome()) {
operation.set_operation_uuid(operationUUID->toBytes());
} else {
- operation.set_operation_uuid(UUID::random().toBytes());
+ operation.set_operation_uuid(id::UUID::random().toBytes());
}
return operation;
@@ -472,7 +472,7 @@ OfferOperation createOfferOperation(
OfferOperationStatusUpdate createOfferOperationStatusUpdate(
- const UUID& operationUUID,
+ const id::UUID& operationUUID,
const OfferOperationStatus& status,
const Option<OfferOperationStatus>& latestStatus,
const Option<FrameworkID>& frameworkId,
@@ -514,7 +514,7 @@ OfferOperationStatusUpdate createOfferOperationStatusUpdate(
MasterInfo createMasterInfo(const UPID& pid)
{
MasterInfo info;
- info.set_id(stringify(pid) + "-" + UUID::random().toString());
+ info.set_id(stringify(pid) + "-" + id::UUID::random().toString());
// NOTE: Currently, we store the ip in network order, which should
// be fixed. See MESOS-1201 for more details.
@@ -856,13 +856,13 @@ bool isSpeculativeOperation(const Offer::Operation& operation)
RepeatedPtrField<ResourceVersionUUID> createResourceVersions(
- const hashmap<Option<ResourceProviderID>, UUID>& resourceVersions)
+ const hashmap<Option<ResourceProviderID>, id::UUID>& resourceVersions)
{
RepeatedPtrField<ResourceVersionUUID> result;
foreachpair (
const Option<ResourceProviderID>& resourceProviderId,
- const UUID& uuid,
+ const id::UUID& uuid,
resourceVersions) {
ResourceVersionUUID* entry = result.Add();
@@ -876,10 +876,10 @@ RepeatedPtrField<ResourceVersionUUID> createResourceVersions(
}
-hashmap<Option<ResourceProviderID>, UUID> parseResourceVersions(
+hashmap<Option<ResourceProviderID>, id::UUID> parseResourceVersions(
const RepeatedPtrField<ResourceVersionUUID>& resourceVersionUUIDs)
{
- hashmap<Option<ResourceProviderID>, UUID> result;
+ hashmap<Option<ResourceProviderID>, id::UUID> result;
foreach (
const ResourceVersionUUID& resourceVersionUUID,
@@ -891,7 +891,7 @@ hashmap<Option<ResourceProviderID>, UUID> parseResourceVersions(
CHECK(!result.contains(resourceProviderId));
- const Try<UUID> uuid = UUID::fromBytes(resourceVersionUUID.uuid());
+ const Try<id::UUID> uuid = id::UUID::fromBytes(resourceVersionUUID.uuid());
CHECK_SOME(uuid);
result.insert({std::move(resourceProviderId), std::move(uuid.get())});
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/common/protobuf_utils.hpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.hpp b/src/common/protobuf_utils.hpp
index 03b7caf..e112f19 100644
--- a/src/common/protobuf_utils.hpp
+++ b/src/common/protobuf_utils.hpp
@@ -81,7 +81,7 @@ StatusUpdate createStatusUpdate(
const TaskID& taskId,
const TaskState& state,
const TaskStatus::Source& source,
- const Option<UUID>& uuid,
+ const Option<id::UUID>& uuid,
const std::string& message = "",
const Option<TaskStatus::Reason>& reason = None(),
const Option<ExecutorID>& executorId = None(),
@@ -104,7 +104,7 @@ StatusUpdate createStatusUpdate(
TaskStatus createTaskStatus(
const TaskID& taskId,
const TaskState& state,
- const UUID& uuid,
+ const id::UUID& uuid,
double timestamp);
@@ -121,7 +121,7 @@ TaskStatus createTaskStatus(
// delivered previously.
TaskStatus createTaskStatus(
TaskStatus status,
- const UUID& uuid,
+ const id::UUID& uuid,
double timestamp,
const Option<TaskState>& state = None(),
const Option<std::string>& message = None(),
@@ -158,7 +158,7 @@ OfferOperationStatus createOfferOperationStatus(
const Option<OfferOperationID>& operationId = None(),
const Option<std::string>& message = None(),
const Option<Resources>& convertedResources = None(),
- const Option<UUID>& statusUUID = None());
+ const Option<id::UUID>& statusUUID = None());
OfferOperation createOfferOperation(
@@ -166,11 +166,11 @@ OfferOperation createOfferOperation(
const OfferOperationStatus& latestStatus,
const Option<FrameworkID>& frameworkId,
const Option<SlaveID>& slaveId,
- const Option<UUID>& operationUUID = None());
+ const Option<id::UUID>& operationUUID = None());
OfferOperationStatusUpdate createOfferOperationStatusUpdate(
- const UUID& operationUUID,
+ const id::UUID& operationUUID,
const OfferOperationStatus& status,
const Option<OfferOperationStatus>& latestStatus = None(),
const Option<FrameworkID>& frameworkId = None(),
@@ -217,11 +217,11 @@ bool isSpeculativeOperation(const Offer::Operation& operation);
// Helper function to pack a protobuf list of resource versions.
google::protobuf::RepeatedPtrField<ResourceVersionUUID> createResourceVersions(
- const hashmap<Option<ResourceProviderID>, UUID>& resourceVersions);
+ const hashmap<Option<ResourceProviderID>, id::UUID>& resourceVersions);
// Helper function to unpack a protobuf list of resource versions.
-hashmap<Option<ResourceProviderID>, UUID> parseResourceVersions(
+hashmap<Option<ResourceProviderID>, id::UUID> parseResourceVersions(
const google::protobuf::RepeatedPtrField<ResourceVersionUUID>&
resourceVersionUUIDs);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/examples/long_lived_executor.cpp
----------------------------------------------------------------------
diff --git a/src/examples/long_lived_executor.cpp b/src/examples/long_lived_executor.cpp
index 319db93..21b511d 100644
--- a/src/examples/long_lived_executor.cpp
+++ b/src/examples/long_lived_executor.cpp
@@ -118,7 +118,7 @@ protected:
case Event::ACKNOWLEDGED: {
// Remove the corresponding update.
- updates.erase(UUID::fromBytes(event.acknowledged().uuid()).get());
+ updates.erase(id::UUID::fromBytes(event.acknowledged().uuid()).get());
// Remove the corresponding task.
tasks.erase(event.acknowledged().task_id());
@@ -175,7 +175,7 @@ protected:
void update(const TaskInfo& task, const TaskState& state)
{
- UUID uuid = UUID::random();
+ id::UUID uuid = id::UUID::random();
TaskStatus status;
status.mutable_task_id()->CopyFrom(task.task_id());
@@ -227,7 +227,7 @@ private:
SUBSCRIBED
} state;
- LinkedHashMap<UUID, Call::Update> updates; // Unacknowledged updates.
+ LinkedHashMap<id::UUID, Call::Update> updates; // Unacknowledged updates.
LinkedHashMap<TaskID, TaskInfo> tasks; // Unacknowledged tasks.
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/examples/persistent_volume_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/persistent_volume_framework.cpp b/src/examples/persistent_volume_framework.cpp
index 9ccc7eb..71db39d 100644
--- a/src/examples/persistent_volume_framework.cpp
+++ b/src/examples/persistent_volume_framework.cpp
@@ -211,7 +211,7 @@ public:
if (offered.contains(shard.resources)) {
Resource volume = SHARD_PERSISTENT_VOLUME(
role,
- UUID::random().toString(),
+ id::UUID::random().toString(),
"volume",
frameworkInfo.principal(),
shard.volume.isShared);
@@ -221,7 +221,7 @@ public:
TaskInfo task;
task.set_name(shard.name);
- task.mutable_task_id()->set_value(UUID::random().toString());
+ task.mutable_task_id()->set_value(id::UUID::random().toString());
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(resources.get());
@@ -269,7 +269,7 @@ public:
TaskInfo task;
task.set_name(shard.name);
- task.mutable_task_id()->set_value(UUID::random().toString());
+ task.mutable_task_id()->set_value(id::UUID::random().toString());
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(taskResources);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/examples/test_http_executor.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_http_executor.cpp b/src/examples/test_http_executor.cpp
index 2166faf..fb9209f 100644
--- a/src/examples/test_http_executor.cpp
+++ b/src/examples/test_http_executor.cpp
@@ -105,7 +105,7 @@ public:
void sendStatusUpdate(const TaskInfo& task, const TaskState& state)
{
- UUID uuid = UUID::random();
+ id::UUID uuid = id::UUID::random();
TaskStatus status;
status.mutable_task_id()->CopyFrom(task.task_id());
@@ -173,7 +173,7 @@ public:
cout << "Received an ACKNOWLEDGED event" << endl;
// Remove the corresponding update.
- updates.erase(UUID::fromBytes(event.acknowledged().uuid()).get());
+ updates.erase(id::UUID::fromBytes(event.acknowledged().uuid()).get());
// Remove the corresponding task.
tasks.erase(event.acknowledged().task_id());
@@ -226,7 +226,7 @@ private:
SUBSCRIBED
} state;
- LinkedHashMap<UUID, Call::Update> updates; // Unacknowledged updates.
+ LinkedHashMap<id::UUID, Call::Update> updates; // Unacknowledged updates.
LinkedHashMap<TaskID, TaskInfo> tasks; // Unacknowledged tasks.
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index cdbf149..7fc46da 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -149,7 +149,7 @@ public:
frameworkId(_frameworkId),
executorId(_executorId),
connected(false),
- connection(UUID::random()),
+ connection(id::UUID::random()),
local(_local),
aborted(false),
mutex(_mutex),
@@ -237,7 +237,7 @@ protected:
LOG(INFO) << "Executor registered on agent " << slaveId;
connected = true;
- connection = UUID::random();
+ connection = id::UUID::random();
Stopwatch stopwatch;
if (FLAGS_v >= 1) {
@@ -260,7 +260,7 @@ protected:
LOG(INFO) << "Executor re-registered on agent " << slaveId;
connected = true;
- connection = UUID::random();
+ connection = id::UUID::random();
Stopwatch stopwatch;
if (FLAGS_v >= 1) {
@@ -366,7 +366,7 @@ protected:
const TaskID& taskId,
const string& uuid)
{
- Try<UUID> uuid_ = UUID::fromBytes(uuid);
+ Try<id::UUID> uuid_ = id::UUID::fromBytes(uuid);
CHECK_SOME(uuid_);
if (aborted.load()) {
@@ -475,7 +475,7 @@ protected:
}
}
- void _recoveryTimeout(UUID _connection)
+ void _recoveryTimeout(id::UUID _connection)
{
// If we're connected, no need to shut down the driver!
if (connected) {
@@ -560,7 +560,7 @@ protected:
// We overwrite the UUID for this status update, however with
// the HTTP API, the executor will have to generate a UUID
// (which needs to be validated to be RFC-4122 compliant).
- UUID uuid = UUID::random();
+ id::UUID uuid = id::UUID::random();
update->set_uuid(uuid.toBytes());
update->mutable_status()->set_uuid(uuid.toBytes());
@@ -596,7 +596,7 @@ private:
FrameworkID frameworkId;
ExecutorID executorId;
bool connected; // Registered with the slave.
- UUID connection; // UUID to identify the connection instance.
+ id::UUID connection; // UUID to identify the connection instance.
bool local;
std::atomic_bool aborted;
std::recursive_mutex* mutex;
@@ -606,7 +606,7 @@ private:
Duration recoveryTimeout;
Duration shutdownGracePeriod;
- LinkedHashMap<UUID, StatusUpdate> updates; // Unacknowledged updates.
+ LinkedHashMap<id::UUID, StatusUpdate> updates; // Unacknowledged updates.
// We store tasks that have not been acknowledged
// (via status updates) by the slave. This ensures that, during
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/executor/executor.cpp
----------------------------------------------------------------------
diff --git a/src/executor/executor.cpp b/src/executor/executor.cpp
index 7280951..1c972d9 100644
--- a/src/executor/executor.cpp
+++ b/src/executor/executor.cpp
@@ -353,14 +353,14 @@ protected:
{
CHECK(state == DISCONNECTED || state == CONNECTING) << state;
- connectionId = UUID::random();
+ connectionId = id::UUID::random();
state = CONNECTING;
// This automatic variable is needed for lambda capture. We need to
// create a copy here because `connectionId` might change by the time the
// second `http::connect()` gets called.
- UUID connectionId_ = connectionId.get();
+ id::UUID connectionId_ = connectionId.get();
// We create two persistent connections here, one for subscribe
// call/streaming response and another for non-subscribe calls/responses.
@@ -377,7 +377,7 @@ protected:
}
void connected(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Future<Connection>& connection1,
const Future<Connection>& connection2)
{
@@ -445,7 +445,7 @@ protected:
}
void disconnected(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const string& failure)
{
// Ignore if the disconnection happened from an old stale connection.
@@ -580,7 +580,7 @@ protected:
}
void _send(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Call& call,
const Future<Response>& response)
{
@@ -805,7 +805,7 @@ private:
// the agent (e.g., the agent process restarted while an attempt was in
// progress). This helps us in uniquely identifying the current connection
// instance and ignoring the stale instance.
- Option<UUID> connectionId; // UUID to identify the connection instance.
+ Option<id::UUID> connectionId; // UUID to identify the connection instance.
ContentType contentType;
Callbacks callbacks;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/launcher/default_executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp
index 248c46d..6c88de4 100644
--- a/src/launcher/default_executor.cpp
+++ b/src/launcher/default_executor.cpp
@@ -153,7 +153,7 @@ public:
void connected()
{
state = CONNECTED;
- connectionId = UUID::random();
+ connectionId = id::UUID::random();
doReliableRegistration();
}
@@ -245,7 +245,8 @@ public:
}
case Event::ACKNOWLEDGED: {
- const UUID uuid = UUID::fromBytes(event.acknowledged().uuid()).get();
+ const id::UUID uuid =
+ id::UUID::fromBytes(event.acknowledged().uuid()).get();
if (!unacknowledgedUpdates.contains(uuid)) {
LOG(WARNING) << "Received acknowledgement " << uuid
@@ -406,7 +407,7 @@ protected:
foreach (const TaskInfo& task, taskGroup.tasks()) {
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
containerId.mutable_parent()->CopyFrom(executorContainerId.get());
containerIds.push_back(containerId);
@@ -664,7 +665,7 @@ protected:
void _wait(
const Future<list<Connection>>& _connections,
const list<TaskID>& taskIds,
- const UUID& _connectionId)
+ const id::UUID& _connectionId)
{
// It is possible that the agent process failed in the interim.
// We would resume waiting on the child containers once we
@@ -695,7 +696,7 @@ protected:
}
void __wait(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Connection& connection,
const TaskID& taskId)
{
@@ -734,7 +735,7 @@ protected:
}
void waited(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const TaskID& taskId,
const Future<Response>& response)
{
@@ -1122,7 +1123,7 @@ protected:
}
void escalated(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const ContainerID& containerId,
const TaskID& taskId,
const Duration& timeout)
@@ -1219,7 +1220,7 @@ protected:
CHECK_SOME(containers.at(taskId)->lastTaskStatus);
const TaskStatus status = protobuf::createTaskStatus(
containers.at(taskId)->lastTaskStatus.get(),
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs(),
None(),
None(),
@@ -1270,7 +1271,7 @@ protected:
CHECK_SOME(containers.at(healthStatus.task_id())->lastTaskStatus);
const TaskStatus status = protobuf::createTaskStatus(
containers.at(healthStatus.task_id())->lastTaskStatus.get(),
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs(),
None(),
None(),
@@ -1300,7 +1301,7 @@ private:
TaskStatus status = protobuf::createTaskStatus(
taskId,
state,
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs());
status.mutable_executor_id()->CopyFrom(executorId);
@@ -1370,7 +1371,8 @@ private:
call.mutable_update()->mutable_status()->CopyFrom(status);
// Capture the status update.
- unacknowledgedUpdates[UUID::fromBytes(status.uuid()).get()] = call.update();
+ unacknowledgedUpdates[id::UUID::fromBytes(status.uuid()).get()] =
+ call.update();
// Overwrite the last task status.
CHECK(containers.contains(status.task_id()));
@@ -1403,7 +1405,7 @@ private:
: process::http::request(request);
}
- void retry(const UUID& _connectionId, const TaskID& taskId)
+ void retry(const id::UUID& _connectionId, const TaskID& taskId)
{
if (connectionId != _connectionId) {
VLOG(1) << "Ignoring retry attempt from a stale connection";
@@ -1422,7 +1424,7 @@ private:
void _retry(
const Future<Connection>& connection,
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const TaskID& taskId)
{
const Duration duration = Seconds(1);
@@ -1491,7 +1493,7 @@ private:
const string launcherDirectory;
const Option<string> authorizationHeader;
- LinkedHashMap<UUID, Call::Update> unacknowledgedUpdates;
+ LinkedHashMap<id::UUID, Call::Update> unacknowledgedUpdates;
// Child containers.
LinkedHashMap<TaskID, Owned<Container>> containers;
@@ -1501,7 +1503,7 @@ private:
// uniquely identifying the current connection and ignoring
// the stale instance. We initialize this to a new value upon receiving
// a `connected()` callback.
- Option<UUID> connectionId;
+ Option<id::UUID> connectionId;
};
} // namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index c688c04..31a4710 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -204,7 +204,8 @@ public:
}
case Event::ACKNOWLEDGED: {
- const UUID uuid = UUID::fromBytes(event.acknowledged().uuid()).get();
+ const id::UUID uuid =
+ id::UUID::fromBytes(event.acknowledged().uuid()).get();
if (!unacknowledgedUpdates.contains(uuid)) {
LOG(WARNING) << "Received acknowledgement " << uuid
@@ -308,7 +309,7 @@ protected:
CHECK_SOME(lastTaskStatus);
TaskStatus status = protobuf::createTaskStatus(
lastTaskStatus.get(),
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs(),
None(),
None(),
@@ -342,7 +343,7 @@ protected:
CHECK_SOME(lastTaskStatus);
TaskStatus status = protobuf::createTaskStatus(
lastTaskStatus.get(),
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs(),
None(),
None(),
@@ -1000,7 +1001,7 @@ private:
TaskStatus status = protobuf::createTaskStatus(
_taskId,
state,
- UUID::random(),
+ id::UUID::random(),
Clock::now().secs());
status.mutable_executor_id()->CopyFrom(executorId);
@@ -1059,7 +1060,8 @@ private:
call.mutable_update()->mutable_status()->CopyFrom(status);
// Capture the status update.
- unacknowledgedUpdates[UUID::fromBytes(status.uuid()).get()] = call.update();
+ unacknowledgedUpdates[id::UUID::fromBytes(status.uuid()).get()] =
+ call.update();
// Overwrite the last task status.
lastTaskStatus = status;
@@ -1134,7 +1136,7 @@ private:
const ExecutorID executorId;
Owned<MesosBase> mesos;
- LinkedHashMap<UUID, Call::Update> unacknowledgedUpdates;
+ LinkedHashMap<id::UUID, Call::Update> unacknowledgedUpdates;
Option<TaskStatus> lastTaskStatus;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 21de4bc..ec170a2 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -878,7 +878,7 @@ Future<Response> Master::Http::subscribe(
ok.type = Response::PIPE;
ok.reader = pipe.reader();
- HttpConnection http{pipe.writer(), contentType, UUID::random()};
+ HttpConnection http{pipe.writer(), contentType, id::UUID::random()};
master->subscribe(http, principal);
mesos::master::Event event;
@@ -1058,7 +1058,7 @@ Future<Response> Master::Http::scheduler(
ok.reader = pipe.reader();
// Generate a stream ID and return it in the response.
- UUID streamId = UUID::random();
+ id::UUID streamId = id::UUID::random();
ok.headers["Mesos-Stream-Id"] = streamId.toString();
HttpConnection http {pipe.writer(), acceptType, streamId};
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 2f2608f..a8353ab 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -328,7 +328,7 @@ Master::Master(
// because 'StandaloneMasterDetector' needs access to the info.
// Master ID is generated randomly based on UUID.
- info_.set_id(UUID::random().toString());
+ info_.set_id(id::UUID::random().toString());
// NOTE: Currently, we store ip in MasterInfo in network order,
// which should be fixed. See MESOS-1201 for details.
@@ -2490,7 +2490,7 @@ void Master::receive(
break;
case scheduler::Call::ACKNOWLEDGE: {
- Try<UUID> uuid = UUID::fromBytes(call.acknowledge().uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(call.acknowledge().uuid());
if (uuid.isError()) {
drop(from, call, uuid.error());
return;
@@ -2501,7 +2501,7 @@ void Master::receive(
}
case scheduler::Call::ACKNOWLEDGE_OFFER_OPERATION_UPDATE: {
- Try<UUID> uuid = UUID::fromBytes(
+ Try<id::UUID> uuid = id::UUID::fromBytes(
call.acknowledge_offer_operation_update().status_uuid());
if (uuid.isError()) {
drop(from, call, uuid.error());
@@ -5766,7 +5766,7 @@ void Master::statusUpdateAcknowledgement(
// important as validation logic is moved out of the scheduler
// driver and into the master.
- Try<UUID> uuid_ = UUID::fromBytes(uuid);
+ Try<id::UUID> uuid_ = id::UUID::fromBytes(uuid);
if (uuid_.isError()) {
LOG(WARNING)
<< "Ignoring status update acknowledgement "
@@ -5817,7 +5817,7 @@ void Master::acknowledge(
const SlaveID& slaveId = acknowledge.slave_id();
const TaskID& taskId = acknowledge.task_id();
- const UUID uuid = UUID::fromBytes(acknowledge.uuid()).get();
+ const id::UUID uuid = id::UUID::fromBytes(acknowledge.uuid()).get();
Slave* slave = slaves.registered.get(slaveId);
@@ -5869,7 +5869,7 @@ void Master::acknowledge(
// Remove the task once the terminal update is acknowledged.
if (protobuf::isTerminalState(task->status_update_state()) &&
- UUID::fromBytes(task->status_update_uuid()).get() == uuid) {
+ id::UUID::fromBytes(task->status_update_uuid()).get() == uuid) {
removeTask(task);
}
}
@@ -6297,9 +6297,9 @@ void Master::__registerSlave(
vector<Resource> checkpointedResources = google::protobuf::convert(
std::move(*registerSlaveMessage.mutable_checkpointed_resources()));
- Option<UUID> resourceVersion;
+ Option<id::UUID> resourceVersion;
if (registerSlaveMessage.has_resource_version_uuid()) {
- Try<UUID> uuid = UUID::fromBytes(
+ Try<id::UUID> uuid = id::UUID::fromBytes(
registerSlaveMessage.resource_version_uuid());
CHECK_SOME(uuid);
@@ -6850,9 +6850,9 @@ void Master::__reregisterSlave(
vector<ExecutorInfo> executorInfos = google::protobuf::convert(
std::move(*reregisterSlaveMessage.mutable_executor_infos()));
- Option<UUID> resourceVersion;
+ Option<id::UUID> resourceVersion;
if (reregisterSlaveMessage.has_resource_version_uuid()) {
- Try<UUID> uuid = UUID::fromBytes(
+ Try<id::UUID> uuid = id::UUID::fromBytes(
reregisterSlaveMessage.resource_version_uuid());
CHECK_SOME(uuid);
@@ -6994,9 +6994,9 @@ void Master::___reregisterSlave(
const vector<SlaveInfo::Capability> agentCapabilities =
google::protobuf::convert(reregisterSlaveMessage.agent_capabilities());
- Option<UUID> resourceVersion;
+ Option<id::UUID> resourceVersion;
if (reregisterSlaveMessage.has_resource_version_uuid()) {
- Try<UUID> uuid = UUID::fromBytes(
+ Try<id::UUID> uuid = id::UUID::fromBytes(
reregisterSlaveMessage.resource_version_uuid());
CHECK_SOME(uuid);
@@ -7299,10 +7299,10 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
if (slave->capabilities.resourceProvider) {
CHECK(message.has_resource_version_uuid());
- hashmap<Option<ResourceProviderID>, UUID> resourceVersions;
+ hashmap<Option<ResourceProviderID>, id::UUID> resourceVersions;
- const Try<UUID> slaveResourceVersion =
- UUID::fromBytes(message.resource_version_uuid());
+ const Try<id::UUID> slaveResourceVersion =
+ id::UUID::fromBytes(message.resource_version_uuid());
CHECK_SOME(slaveResourceVersion);
resourceVersions.insert({None(), slaveResourceVersion.get()});
@@ -7314,8 +7314,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
continue;
}
- Try<UUID> resourceVersion =
- UUID::fromBytes(resourceProvider.resource_version_uuid());
+ Try<id::UUID> resourceVersion =
+ id::UUID::fromBytes(resourceProvider.resource_version_uuid());
CHECK_SOME(resourceVersion);
@@ -7333,13 +7333,14 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
}
// Check if the known offer operations for this agent changed.
- const hashset<UUID> knownOfferOperations = slave->offerOperations.keys();
- hashset<UUID> receivedOfferOperations;
+ const hashset<id::UUID> knownOfferOperations = slave->offerOperations.keys();
+ hashset<id::UUID> receivedOfferOperations;
foreach (
const OfferOperation& operation,
message.offer_operations().operations()) {
- Try<UUID> operationUuid = UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> operationUuid =
+ id::UUID::fromBytes(operation.operation_uuid());
CHECK_SOME(operationUuid);
receivedOfferOperations.insert(operationUuid.get());
}
@@ -7351,7 +7352,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
foreach (
const OfferOperation& operation,
resourceProvider.operations().operations()) {
- Try<UUID> operationUuid = UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> operationUuid =
+ id::UUID::fromBytes(operation.operation_uuid());
CHECK_SOME(operationUuid);
receivedOfferOperations.insert(operationUuid.get());
}
@@ -7370,8 +7372,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
{
Option<Resources> oldTotal;
Option<Resources> newTotal;
- Option<hashmap<UUID, OfferOperation>> oldOfferOperations;
- Option<hashmap<UUID, OfferOperation>> newOfferOperations;
+ Option<hashmap<id::UUID, OfferOperation>> oldOfferOperations;
+ Option<hashmap<id::UUID, OfferOperation>> newOfferOperations;
Option<ResourceProviderInfo> info;
};
@@ -7409,7 +7411,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
// Process known offer operations.
foreachpair (
- const UUID& uuid,
+ const id::UUID& uuid,
OfferOperation* operation,
slave->offerOperations) {
Result<ResourceProviderID> providerId_ =
@@ -7428,7 +7430,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
// create a record for this resource provider if needed.
if (resourceProviders[providerId].oldOfferOperations.isNone()) {
resourceProviders.at(providerId).oldOfferOperations =
- hashmap<UUID, OfferOperation>();
+ hashmap<id::UUID, OfferOperation>();
}
resourceProviders.at(providerId)
@@ -7441,12 +7443,12 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
// Process received agent offer operations.
resourceProviders[None()].newOfferOperations =
- hashmap<UUID, OfferOperation>();
+ hashmap<id::UUID, OfferOperation>();
foreach (
const OfferOperation& operation,
message.offer_operations().operations()) {
- Try<UUID> uuid = UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation.operation_uuid());
CHECK_SOME(uuid) << "Could not deserialize operation id when reconciling "
"offer operations";
@@ -7469,13 +7471,13 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
provider.newTotal = resourceProvider.total_resources();
if (provider.newOfferOperations.isNone()) {
- provider.newOfferOperations = hashmap<UUID, OfferOperation>();
+ provider.newOfferOperations = hashmap<id::UUID, OfferOperation>();
}
foreach (
const OfferOperation& operation,
resourceProvider.operations().operations()) {
- Try<UUID> uuid = UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation.operation_uuid());
CHECK_SOME(uuid)
<< "Could not deserialize operation id when reconciling "
"offer operations";
@@ -7508,10 +7510,10 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
// acknowledgement, or the agent initiates an unrelated
// `UpdateSlaveMessage`.
auto extractPendingOperations =
- [](const hashmap<UUID, OfferOperation>& source,
- hashset<UUID>* target) {
+ [](const hashmap<id::UUID, OfferOperation>& source,
+ hashset<id::UUID>* target) {
foreachpair (
- const UUID& uuid, const OfferOperation& operation, source) {
+ const id::UUID& uuid, const OfferOperation& operation, source) {
if (!protobuf::isTerminalState(
operation.latest_status().state())) {
target->insert(uuid);
@@ -7519,8 +7521,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
}
};
- hashset<UUID> oldPendingOperations;
- hashset<UUID> newPendingOperations;
+ hashset<id::UUID> oldPendingOperations;
+ hashset<id::UUID> newPendingOperations;
if (provider.oldOfferOperations.isSome()) {
extractPendingOperations(
@@ -7532,7 +7534,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
provider.newOfferOperations.get(), &newPendingOperations);
}
- foreach (const UUID& uuid, newPendingOperations) {
+ foreach (const id::UUID& uuid, newPendingOperations) {
CHECK(oldPendingOperations.contains(uuid))
<< "Agent tried to reconcile unknown non-terminal offer "
"operation "
@@ -7612,7 +7614,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
if (provider.newOfferOperations.isSome()) {
foreachpair (
- const UUID& uuid,
+ const id::UUID& uuid,
const OfferOperation& operation,
provider.newOfferOperations.get()) {
// Update to bookkeeping of operations.
@@ -7648,7 +7650,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
// generated and the master will remove the operation from its state upon
// receipt of that update.
if (provider.oldOfferOperations.isSome()) {
- foreachkey (const UUID& uuid, provider.oldOfferOperations.get()) {
+ foreachkey (const id::UUID& uuid, provider.oldOfferOperations.get()) {
if (provider.newOfferOperations.isNone() ||
!provider.newOfferOperations->contains(uuid)) {
LOG(WARNING) << "Performing explicit reconciliation with agent for"
@@ -7839,7 +7841,7 @@ void Master::statusUpdate(StatusUpdate update, const UPID& pid)
return;
}
- Try<UUID> uuid = UUID::fromBytes(update.uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.uuid());
if (uuid.isError()) {
LOG(WARNING) << "Ignoring status update "
<< " from agent " << *slave
@@ -7940,7 +7942,7 @@ void Master::offerOperationStatusUpdate(
? update.framework_id()
: Option<FrameworkID>::none();
- Try<UUID> uuid = UUID::fromBytes(update.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.operation_uuid());
if (uuid.isError()) {
LOG(ERROR) << "Failed to parse offer operation UUID for operation "
<< "'" << update.status().operation_id() << "' for "
@@ -10356,7 +10358,7 @@ void Master::updateOfferOperation(
operation->add_statuses()->CopyFrom(status);
- Try<UUID> uuid = UUID::fromBytes(update.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.operation_uuid());
CHECK_SOME(uuid);
LOG(INFO) << "Updating the state of offer operation '"
@@ -10522,7 +10524,7 @@ void Master::_apply(
// This must have been validated by the caller.
CHECK(!resourceProviderId.isError());
- Option<UUID> resourceVersion = resourceProviderId.isSome()
+ Option<id::UUID> resourceVersion = resourceProviderId.isSome()
? slave->resourceVersions.get(resourceProviderId.get())
: slave->resourceVersions.get(None());
@@ -10570,7 +10572,8 @@ void Master::_apply(
message.mutable_resource_version_uuid()
->set_uuid(resourceVersion->toBytes());
- Try<UUID> operationUUID = UUID::fromBytes(offerOperation->operation_uuid());
+ Try<id::UUID> operationUUID =
+ id::UUID::fromBytes(offerOperation->operation_uuid());
CHECK_SOME(operationUUID);
LOG(INFO) << "Sending offer operation '"
@@ -11298,7 +11301,7 @@ void Master::Subscribers::Subscriber::send(
}
-void Master::exited(const UUID& id)
+void Master::exited(const id::UUID& id)
{
if (!subscribers.subscribed.contains(id)) {
LOG(WARNING) << "Unknown subscriber " << id << " disconnected";
@@ -11341,7 +11344,7 @@ Slave::Slave(
vector<SlaveInfo::Capability> _capabilites,
const Time& _registeredTime,
vector<Resource> _checkpointedResources,
- const Option<UUID>& resourceVersion,
+ const Option<id::UUID>& resourceVersion,
vector<ExecutorInfo> executorInfos,
vector<Task> tasks)
: master(_master),
@@ -11479,7 +11482,7 @@ void Slave::removeTask(Task* task)
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);
@@ -11530,7 +11533,7 @@ void Slave::recoverResources(OfferOperation* operation)
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);
CHECK(offerOperations.contains(uuid.get()))
@@ -11546,7 +11549,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);
@@ -11651,7 +11654,7 @@ Try<Nothing> Slave::update(
const SlaveInfo& _info,
const string& _version,
const vector<SlaveInfo::Capability>& _capabilities,
- const Option<UUID>& resourceVersion)
+ const Option<id::UUID>& resourceVersion)
{
Try<Resources> resources = applyCheckpointedResources(
_info.resources(),
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 2d74ec4..004be71 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -116,15 +116,15 @@ struct Role;
struct Slave
{
- Slave(Master* const _master,
- SlaveInfo _info,
+Slave(Master* const _master,
+ SlaveInfo _info,
const process::UPID& _pid,
const MachineID& _machineId,
const std::string& _version,
std::vector<SlaveInfo::Capability> _capabilites,
const process::Time& _registeredTime,
std::vector<Resource> _checkpointedResources,
- const Option<UUID>& resourceVersion,
+ const Option<id::UUID>& resourceVersion,
std::vector<ExecutorInfo> executorInfos = std::vector<ExecutorInfo>(),
std::vector<Task> tasks = std::vector<Task>());
@@ -152,7 +152,7 @@ struct Slave
void removeOfferOperation(OfferOperation* operation);
- OfferOperation* getOfferOperation(const UUID& uuid) const;
+ OfferOperation* getOfferOperation(const id::UUID& uuid) const;
void addOffer(Offer* offer);
@@ -180,7 +180,7 @@ struct Slave
const SlaveInfo& info,
const std::string& _version,
const std::vector<SlaveInfo::Capability>& _capabilites,
- const Option<UUID>& resourceVersion);
+ const Option<id::UUID>& resourceVersion);
Master* const master;
const SlaveID id;
@@ -244,7 +244,7 @@ struct Slave
// Pending operations or terminal operations that have
// unacknowledged status updates on this agent.
- hashmap<UUID, OfferOperation*> offerOperations;
+ hashmap<id::UUID, OfferOperation*> offerOperations;
// Active offers on this slave.
hashset<Offer*> offers;
@@ -277,7 +277,7 @@ struct Slave
SlaveObserver* observer;
- hashmap<Option<ResourceProviderID>, UUID> resourceVersions;
+ hashmap<Option<ResourceProviderID>, id::UUID> resourceVersions;
hashmap<ResourceProviderID, ResourceProviderInfo> resourceProviders;
private:
@@ -299,7 +299,7 @@ struct HttpConnection
{
HttpConnection(const process::http::Pipe::Writer& _writer,
ContentType _contentType,
- UUID _streamId)
+ id::UUID _streamId)
: writer(_writer),
contentType(_contentType),
streamId(_streamId) {}
@@ -327,7 +327,7 @@ struct HttpConnection
process::http::Pipe::Writer writer;
ContentType contentType;
- UUID streamId;
+ id::UUID streamId;
};
@@ -559,7 +559,7 @@ protected:
void _exited(Framework* framework);
// Invoked upon noticing a subscriber disconnection.
- void exited(const UUID& id);
+ void exited(const id::UUID& id);
void agentReregisterTimeout(const SlaveID& slaveId);
Nothing _agentReregisterTimeout(const SlaveID& slaveId);
@@ -2015,7 +2015,7 @@ private:
// Active subscribers to the 'api/vX' endpoint keyed by the stream
// identifier.
- hashmap<UUID, process::Owned<Subscriber>> subscribed;
+ hashmap<id::UUID, process::Owned<Subscriber>> subscribed;
} subscribers;
hashmap<OfferID, Offer*> offers;
@@ -2462,7 +2462,7 @@ struct Framework
const FrameworkID& frameworkId = operation->framework_id();
- 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()))
@@ -2549,7 +2549,7 @@ struct Framework
void 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()))
@@ -2819,11 +2819,11 @@ struct Framework
// Pending operations or terminal operations that have
// unacknowledged status updates.
- hashmap<UUID, OfferOperation*> offerOperations;
+ hashmap<id::UUID, OfferOperation*> offerOperations;
// The map from the framework-specified operation ID to the
// corresponding internal operation UUID.
- hashmap<OfferOperationID, UUID> offerOperationUUIDs;
+ hashmap<OfferOperationID, id::UUID> offerOperationUUIDs;
// NOTE: For the used and offered resources below, we keep the
// total as well as partitioned by SlaveID.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index a9b0805..7f5a67d 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -584,7 +584,7 @@ Option<Error> validate(
return Error("Expecting 'acknowledge' to be present");
}
- Try<UUID> uuid = UUID::fromBytes(call.acknowledge().uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(call.acknowledge().uuid());
if (uuid.isError()) {
return uuid.error();
}
@@ -597,7 +597,7 @@ Option<Error> validate(
"Expecting 'acknowledge_offer_operation_update' to be present");
}
- Try<UUID> uuid = UUID::fromBytes(
+ Try<id::UUID> uuid = id::UUID::fromBytes(
call.acknowledge_offer_operation_update().status_uuid());
if (uuid.isError()) {
return uuid.error();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/messages/messages.cpp
----------------------------------------------------------------------
diff --git a/src/messages/messages.cpp b/src/messages/messages.cpp
index 56876f2..9efbe7f 100644
--- a/src/messages/messages.cpp
+++ b/src/messages/messages.cpp
@@ -110,7 +110,7 @@ ostream& operator<<(ostream& stream, const StatusUpdate& update)
if (update.has_uuid()) {
stream << " (Status UUID: "
- << stringify(UUID::fromBytes(update.uuid()).get()) << ")";
+ << stringify(id::UUID::fromBytes(update.uuid()).get()) << ")";
}
stream << " for task " << update.status().task_id();
@@ -130,12 +130,13 @@ ostream& operator<<(ostream& stream, const OfferOperationStatusUpdate& update)
if (update.status().has_status_uuid()) {
stream << " (Status UUID: "
- << stringify(UUID::fromBytes(update.status().status_uuid()).get())
+ << stringify(
+ id::UUID::fromBytes(update.status().status_uuid()).get())
<< ")";
}
stream << " for operation UUID "
- << stringify(UUID::fromBytes(update.operation_uuid()).get());
+ << stringify(id::UUID::fromBytes(update.operation_uuid()).get());
if (update.status().has_operation_id()) {
stream << " (framework-supplied ID '" << update.status().operation_id()
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/resource_provider/daemon.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/daemon.cpp b/src/resource_provider/daemon.cpp
index f160a87..d0a8186 100644
--- a/src/resource_provider/daemon.cpp
+++ b/src/resource_provider/daemon.cpp
@@ -105,14 +105,14 @@ private:
struct ProviderData
{
ProviderData(const string& _path, const ResourceProviderInfo& _info)
- : path(_path), info(_info), version(UUID::random()) {}
+ : path(_path), info(_info), version(id::UUID::random()) {}
const string path;
ResourceProviderInfo info;
// The `version` is used to check if `provider` holds a resource
// provider instance that is in sync with the current config.
- UUID version;
+ id::UUID version;
Owned<LocalResourceProvider> provider;
};
@@ -128,7 +128,7 @@ private:
Future<Nothing> _launch(
const string& type,
const string& name,
- const UUID& version,
+ const id::UUID& version,
const Option<string>& authToken);
Future<Option<string>> generateAuthToken(const ResourceProviderInfo& info);
@@ -192,7 +192,7 @@ Future<bool> LocalResourceProviderDaemonProcess::add(
// with existing ad-hoc config files.
const string path = path::join(
configDir.get(),
- strings::join(".", info.type(), info.name(), UUID::random(), "json"));
+ strings::join(".", info.type(), info.name(), id::UUID::random(), "json"));
LOG(INFO) << "Creating new config file '" << path << "'";
@@ -243,7 +243,7 @@ Future<bool> LocalResourceProviderDaemonProcess::update(
data.info = info;
// Update `version` to indicate that the config has been updated.
- data.version = UUID::random();
+ data.version = id::UUID::random();
// Launch the resource provider if the daemon is already started.
if (slaveId.isSome()) {
@@ -425,7 +425,7 @@ Future<Nothing> LocalResourceProviderDaemonProcess::launch(
Future<Nothing> LocalResourceProviderDaemonProcess::_launch(
const string& type,
const string& name,
- const UUID& version,
+ const id::UUID& version,
const Option<string>& authToken)
{
// If the resource provider config is removed, abort the launch sequence.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/resource_provider/http_connection.hpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/http_connection.hpp b/src/resource_provider/http_connection.hpp
index 47686a8..207120a 100644
--- a/src/resource_provider/http_connection.hpp
+++ b/src/resource_provider/http_connection.hpp
@@ -220,7 +220,7 @@ protected:
LOG(INFO) << "New endpoint detected at " << endpoint.get();
- connectionId = UUID::random();
+ connectionId = id::UUID::random();
dispatch(self(), &Self::connect, connectionId.get());
}
@@ -229,7 +229,7 @@ protected:
.onAny(defer(self(), &Self::detected, lambda::_1));
}
- void connect(const UUID& _connectionId)
+ void connect(const id::UUID& _connectionId)
{
// It is possible that a new endpoint was detected while we were
// waiting to establish a connection with the old master.
@@ -253,7 +253,7 @@ protected:
}
void connected(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const process::Future<std::tuple<
process::http::Connection, process::http::Connection>>& _connections)
{
@@ -324,7 +324,7 @@ protected:
connectionId = None();
}
- void disconnected(const UUID& _connectionId, const std::string& failure)
+ void disconnected(const id::UUID& _connectionId, const std::string& failure)
{
// Ignore if the disconnection happened from an old stale connection.
if (connectionId != _connectionId) {
@@ -339,7 +339,7 @@ protected:
}
process::Future<Nothing> _send(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Call& call,
const process::http::Response& response)
{
@@ -372,8 +372,8 @@ protected:
subscribed = SubscribedResponse(reader, std::move(decoder));
if (response.headers.contains("Mesos-Stream-Id")) {
- Try<UUID> uuid =
- UUID::fromString(response.headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response.headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
@@ -553,8 +553,8 @@ private:
// while an attempt was in progress). This helps us in uniquely
// identifying the current connection instance and ignoring the
// stale instance.
- Option<UUID> connectionId;
- Option<UUID> streamId;
+ Option<id::UUID> connectionId;
+ Option<id::UUID> streamId;
process::Future<Option<process::http::URL>> detection;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index 046dba7..d9e0d25 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -89,7 +89,7 @@ struct HttpConnection
{
HttpConnection(const http::Pipe::Writer& _writer,
ContentType _contentType,
- UUID _streamId)
+ id::UUID _streamId)
: writer(_writer),
contentType(_contentType),
streamId(_streamId),
@@ -116,7 +116,7 @@ struct HttpConnection
http::Pipe::Writer writer;
ContentType contentType;
- UUID streamId;
+ id::UUID streamId;
::recordio::Encoder<v1::resource_provider::Event> encoder;
};
@@ -144,7 +144,7 @@ struct ResourceProvider
ResourceProviderInfo info;
HttpConnection http;
- hashmap<UUID, Owned<Promise<Nothing>>> publishes;
+ hashmap<id::UUID, Owned<Promise<Nothing>>> publishes;
};
@@ -279,7 +279,7 @@ Future<http::Response> ResourceProviderManagerProcess::api(
ok.reader = pipe.reader();
// Generate a stream ID and return it in the response.
- UUID streamId = UUID::random();
+ id::UUID streamId = id::UUID::random();
ok.headers["Mesos-Stream-Id"] = streamId.toString();
HttpConnection http(pipe.writer(), acceptType, streamId);
@@ -350,7 +350,7 @@ void ResourceProviderManagerProcess::applyOfferOperation(
const Offer::Operation& operation = message.operation_info();
const FrameworkID& frameworkId = message.framework_id();
- 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 "
<< "'" << operation.id() << "' from framework "
@@ -534,7 +534,7 @@ Future<Nothing> ResourceProviderManagerProcess::publishResources(
foreachpair (const ResourceProviderID& resourceProviderId,
const Resources& resources,
providedResources) {
- UUID uuid = UUID::random();
+ id::UUID uuid = id::UUID::random();
Event event;
event.set_type(Event::PUBLISH_RESOURCES);
@@ -656,16 +656,16 @@ void ResourceProviderManagerProcess::updateState(
// TODO(chhsiao): Report pending operations.
- Try<UUID> resourceVersion =
- UUID::fromBytes(update.resource_version_uuid());
+ Try<id::UUID> resourceVersion =
+ id::UUID::fromBytes(update.resource_version_uuid());
CHECK_SOME(resourceVersion)
<< "Could not deserialize version of resource provider "
<< resourceProvider->info.id() << ": " << resourceVersion.error();
- hashmap<UUID, OfferOperation> offerOperations;
+ hashmap<id::UUID, OfferOperation> offerOperations;
foreach (const OfferOperation &operation, update.operations()) {
- 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);
@@ -693,7 +693,7 @@ void ResourceProviderManagerProcess::updatePublishResourcesStatus(
ResourceProvider* resourceProvider,
const Call::UpdatePublishResourcesStatus& update)
{
- Try<UUID> uuid = UUID::fromBytes(update.uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.uuid());
if (uuid.isError()) {
LOG(ERROR) << "Invalid UUID in UpdatePublishResourcesStatus from resource"
<< " provider " << resourceProvider->info.id()
@@ -731,7 +731,7 @@ void ResourceProviderManagerProcess::updatePublishResourcesStatus(
ResourceProviderID ResourceProviderManagerProcess::newResourceProviderId()
{
ResourceProviderID resourceProviderId;
- resourceProviderId.set_value(UUID::random().toString());
+ resourceProviderId.set_value(id::UUID::random().toString());
return resourceProviderId;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/resource_provider/message.hpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/message.hpp b/src/resource_provider/message.hpp
index 137554a..bac3ffb 100644
--- a/src/resource_provider/message.hpp
+++ b/src/resource_provider/message.hpp
@@ -48,9 +48,9 @@ struct ResourceProviderMessage
struct UpdateState
{
ResourceProviderInfo info;
- UUID resourceVersion;
+ id::UUID resourceVersion;
Resources totalResources;
- hashmap<UUID, OfferOperation> offerOperations;
+ hashmap<id::UUID, OfferOperation> offerOperations;
};
struct UpdateOfferOperationStatus
@@ -95,8 +95,8 @@ inline std::ostream& operator<<(
CHECK_SOME(updateOfferOperationStatus);
- Try<UUID> operationUUID =
- UUID::fromBytes(updateOfferOperationStatus->update.operation_uuid());
+ Try<id::UUID> operationUUID = id::UUID::fromBytes(
+ updateOfferOperationStatus->update.operation_uuid());
CHECK_SOME(operationUUID);
return stream
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index 72bd413..cce4633 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1796,7 +1796,7 @@ MesosSchedulerDriver::MesosSchedulerDriver(
status(DRIVER_NOT_STARTED),
implicitAcknowlegements(true),
credential(nullptr),
- schedulerId("scheduler-" + UUID::random().toString())
+ schedulerId("scheduler-" + id::UUID::random().toString())
{
initialize();
}
@@ -1816,7 +1816,7 @@ MesosSchedulerDriver::MesosSchedulerDriver(
status(DRIVER_NOT_STARTED),
implicitAcknowlegements(true),
credential(new Credential(_credential)),
- schedulerId("scheduler-" + UUID::random().toString())
+ schedulerId("scheduler-" + id::UUID::random().toString())
{
initialize();
}
@@ -1836,7 +1836,7 @@ MesosSchedulerDriver::MesosSchedulerDriver(
status(DRIVER_NOT_STARTED),
implicitAcknowlegements(_implicitAcknowlegements),
credential(nullptr),
- schedulerId("scheduler-" + UUID::random().toString())
+ schedulerId("scheduler-" + id::UUID::random().toString())
{
initialize();
}
@@ -1857,7 +1857,7 @@ MesosSchedulerDriver::MesosSchedulerDriver(
status(DRIVER_NOT_STARTED),
implicitAcknowlegements(_implicitAcknowlegements),
credential(new Credential(_credential)),
- schedulerId("scheduler-" + UUID::random().toString())
+ schedulerId("scheduler-" + id::UUID::random().toString())
{
initialize();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index e354709..07d2b37 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -336,7 +336,7 @@ protected:
.onAny(defer(self(), &MesosProcess::detected, lambda::_1));
}
- void connect(const UUID& _connectionId)
+ void connect(const id::UUID& _connectionId)
{
// It is possible that a new master was detected while we were waiting
// to establish a connection with the old master.
@@ -361,7 +361,7 @@ protected:
}
void connected(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Future<tuple<Connection, Connection>>& _connections)
{
// It is possible that a new master was detected while we had an ongoing
@@ -411,7 +411,7 @@ protected:
}
void disconnected(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const string& failure)
{
// Ignore if the disconnection happened from an old stale connection.
@@ -493,7 +493,7 @@ protected:
LOG(INFO) << "New master detected at " << upid;
- connectionId = UUID::random();
+ connectionId = id::UUID::random();
// Wait for a random duration between 0 and `flags.connectionDelayMax`
// before (re-)connecting with the master.
@@ -577,7 +577,7 @@ protected:
}
void __send(
- const UUID& _connectionId,
+ const id::UUID& _connectionId,
const Call& call,
const Future<process::http::Response>& response)
{
@@ -620,8 +620,8 @@ protected:
// Responses to SUBSCRIBE calls should always include a stream ID.
CHECK(response->headers.contains("Mesos-Stream-Id"));
- Try<UUID> uuid =
- UUID::fromString(response->headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response->headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
@@ -832,7 +832,7 @@ private:
// the master (e.g., the master failed over while an attempt was in progress).
// This helps us in uniquely identifying the current connection instance and
// ignoring the stale instance.
- Option<UUID> connectionId; // UUID to identify the connection instance.
+ Option<id::UUID> connectionId; // UUID to identify the connection instance.
Option<Connections> connections;
Option<SubscribedResponse> subscribed;
@@ -844,7 +844,7 @@ private:
shared_ptr<MasterDetector> detector;
queue<Event> events;
Option<::URL> master;
- Option<UUID> streamId;
+ Option<id::UUID> streamId;
const Flags flags;
Owned<mesos::http::authentication::Authenticatee> authenticatee;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 229891d..890cb2a 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -147,7 +147,7 @@ Option<ContainerID> parse(const Docker::Container& container)
// Check if id is a valid UUID.
if (containerId.isSome()) {
- Try<UUID> uuid = UUID::fromString(containerId.get().value());
+ Try<id::UUID> uuid = id::UUID::fromString(containerId.get().value());
if (uuid.isError()) {
return None();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/containerizer/mesos/io/switchboard.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp
index 8a00e6d..af8fbe8 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -500,7 +500,7 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare(
switchboardFlags.socket_path = path::join(
stringify(os::PATH_SEPARATOR),
"tmp",
- "mesos-io-switchboard-" + UUID::random().toString());
+ "mesos-io-switchboard-" + id::UUID::random().toString());
// Just before launching our io switchboard server, we need to
// create a directory to hold checkpointed files related to the
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/containerizer/mesos/isolators/volume/secret.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/volume/secret.cpp b/src/slave/containerizer/mesos/isolators/volume/secret.cpp
index ba23519..8071e4e 100644
--- a/src/slave/containerizer/mesos/isolators/volume/secret.cpp
+++ b/src/slave/containerizer/mesos/isolators/volume/secret.cpp
@@ -124,7 +124,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSecretIsolatorProcess::prepare(
const string sandboxSecretRootDir =
path::join(containerConfig.directory(),
- SECRET_DIR + string("-") + stringify(UUID::random()));
+ SECRET_DIR + string("-") + stringify(id::UUID::random()));
// TODO(Kapil): Add some UUID suffix to the secret-root dir to avoid conflicts
// with user container_path.
@@ -236,7 +236,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSecretIsolatorProcess::prepare(
}
const string hostSecretPath =
- path::join(flags.runtime_dir, SECRET_DIR, stringify(UUID::random()));
+ path::join(flags.runtime_dir, SECRET_DIR, stringify(id::UUID::random()));
const string sandboxSecretPath =
path::join(sandboxSecretRootDir,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/containerizer/mesos/provisioner/provisioner.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.cpp b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
index a177744..61e7718 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
@@ -535,7 +535,7 @@ Future<ProvisionInfo> ProvisionerProcess::_provision(
{
CHECK(backends.contains(backend));
- string rootfsId = UUID::random().toString();
+ string rootfsId = id::UUID::random().toString();
string rootfs = provisioner::paths::getContainerRootfsDir(
rootDir,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/paths.cpp
----------------------------------------------------------------------
diff --git a/src/slave/paths.cpp b/src/slave/paths.cpp
index f9f0c78..fca2a0e 100644
--- a/src/slave/paths.cpp
+++ b/src/slave/paths.cpp
@@ -556,13 +556,13 @@ Try<list<string>> getOfferOperationPaths(
string getOfferOperationPath(
const string& rootDir,
- const UUID& operationUuid)
+ const id::UUID& operationUuid)
{
return path::join(rootDir, OFFER_OPERATIONS_DIR, operationUuid.toString());
}
-Try<UUID> parseOfferOperationPath(
+Try<id::UUID> parseOfferOperationPath(
const string& rootDir,
const string& dir)
{
@@ -578,7 +578,7 @@ Try<UUID> parseOfferOperationPath(
prefix + "'");
}
- Try<UUID> operationUuid = UUID::fromString(Path(dir).basename());
+ Try<id::UUID> operationUuid = id::UUID::fromString(Path(dir).basename());
if (operationUuid.isError()) {
return Error(
"Could not decode offer operation UUID from string '" +
@@ -591,7 +591,7 @@ Try<UUID> parseOfferOperationPath(
string getOfferOperationUpdatesPath(
const string& rootDir,
- const UUID& operationUuid)
+ const id::UUID& operationUuid)
{
return path::join(
getOfferOperationPath(rootDir, operationUuid),
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/slave/paths.hpp
----------------------------------------------------------------------
diff --git a/src/slave/paths.hpp b/src/slave/paths.hpp
index bae68d0..9cbacd8 100644
--- a/src/slave/paths.hpp
+++ b/src/slave/paths.hpp
@@ -359,17 +359,17 @@ Try<std::list<std::string>> getOfferOperationPaths(
std::string getOfferOperationPath(
const std::string& rootDir,
- const UUID& operationUuid);
+ const id::UUID& operationUuid);
-Try<UUID> parseOfferOperationPath(
+Try<id::UUID> parseOfferOperationPath(
const std::string& rootDir,
const std::string& dir);
std::string getOfferOperationUpdatesPath(
const std::string& rootDir,
- const UUID& operationUuid);
+ const id::UUID& operationUuid);
std::string getResourcesInfoPath(
[6/6] mesos git commit: Introduced a 'UUID' type.
Posted by bb...@apache.org.
Introduced a 'UUID' type.
Review: https://reviews.apache.org/r/64168/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/605b238d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/605b238d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/605b238d
Branch: refs/heads/master
Commit: 605b238d601b520c88143df9b9a3bcca1f705eca
Parents: 23d76de
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Thu Dec 14 17:29:38 2017 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Dec 14 17:35:08 2017 +0100
----------------------------------------------------------------------
include/mesos/mesos.proto | 12 ++++-
.../resource_provider/resource_provider.proto | 18 +++----
include/mesos/type_utils.hpp | 12 +++++
include/mesos/v1/mesos.proto | 12 ++++-
.../resource_provider/resource_provider.proto | 18 +++----
src/common/protobuf_utils.cpp | 13 ++---
src/common/type_utils.cpp | 17 +++++++
src/master/master.cpp | 52 ++++++++++----------
src/master/master.hpp | 6 ++-
src/messages/messages.cpp | 6 +--
src/messages/messages.proto | 26 +++++-----
src/resource_provider/manager.cpp | 44 ++++++++---------
src/resource_provider/message.hpp | 7 +--
src/slave/slave.cpp | 32 ++++++------
src/status_update_manager/offer_operation.cpp | 3 +-
.../status_update_manager_process.hpp | 10 ++--
src/tests/mesos.hpp | 7 +--
...er_operation_status_update_manager_tests.cpp | 4 +-
src/tests/resource_provider_manager_tests.cpp | 17 ++++---
.../resource_provider_validation_tests.cpp | 5 +-
src/tests/slave_tests.cpp | 13 +++--
21 files changed, 190 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 9e4c669..ddb9d36 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -2249,6 +2249,14 @@ message TaskResourceLimitation {
/**
+ * Describes a UUID.
+ */
+message UUID {
+ required bytes value = 1;
+}
+
+
+/**
* Describes an offer operation, similar to `Offer.Operation`, with
* some additional information.
*/
@@ -2266,7 +2274,7 @@ message OfferOperation {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which is
// optional.
- required bytes operation_uuid = 6;
+ required UUID operation_uuid = 6;
}
@@ -2311,7 +2319,7 @@ message OfferOperationStatus {
// Statuses that are delivered reliably to the scheduler will
// include a `status_uuid`. The status is considered delivered once
// it is acknowledged by the scheduler.
- optional bytes status_uuid = 5;
+ optional UUID status_uuid = 5;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 7ec6936..4534049 100644
--- a/include/mesos/resource_provider/resource_provider.proto
+++ b/include/mesos/resource_provider/resource_provider.proto
@@ -54,7 +54,7 @@ message Event {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which
// is optional.
- required bytes operation_uuid = 3;
+ required UUID operation_uuid = 3;
// Used to establish the relationship between the operation and
// the resources that the operation is operating on. Each resource
@@ -68,13 +68,13 @@ message Event {
// that it maintains, because this means the operation is
// operating on resources that might have already been
// invalidated.
- required bytes resource_version_uuid = 4;
+ required UUID resource_version_uuid = 4;
}
// Received when the master wants to launch a task using resources
// of this resource provider.
message PublishResources {
- required bytes uuid = 1;
+ required UUID uuid = 1;
repeated Resource resources = 2;
}
@@ -82,10 +82,10 @@ message Event {
// Acknowledgements may be generated either by a framework or by the master.
message AcknowledgeOfferOperation {
// The UUID from the `OfferOperationStatus` being acknowledged.
- required bytes status_uuid = 1;
+ required UUID status_uuid = 1;
// The UUID from the relevant `OfferOperation`.
- required bytes operation_uuid = 2;
+ required UUID operation_uuid = 2;
}
// Received when the resource provider manager wants to reconcile its view of
@@ -93,7 +93,7 @@ message Event {
// generate offer operation status updates for any operation UUIDs in this
// message which are unknown to the resource provider.
message ReconcileOfferOperations {
- repeated bytes operation_uuids = 1;
+ repeated UUID operation_uuids = 1;
}
optional Type type = 1;
@@ -133,7 +133,7 @@ message Call {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which
// is optional.
- required bytes operation_uuid = 4;
+ required UUID operation_uuid = 4;
}
// Notify the master about the total resources and pending operations.
@@ -157,7 +157,7 @@ message Call {
// that it maintains, because this means the operation is
// operating on resources that might have already been
// invalidated.
- required bytes resource_version_uuid = 3;
+ required UUID resource_version_uuid = 3;
}
message UpdatePublishResourcesStatus {
@@ -167,7 +167,7 @@ message Call {
FAILED = 2;
}
- required bytes uuid = 1;
+ required UUID uuid = 1;
required Status status = 2;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/include/mesos/type_utils.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/type_utils.hpp b/include/mesos/type_utils.hpp
index 1bcc521..4d012cc 100644
--- a/include/mesos/type_utils.hpp
+++ b/include/mesos/type_utils.hpp
@@ -81,6 +81,7 @@ bool operator==(const TaskGroupInfo& left, const TaskGroupInfo& right);
bool operator==(const TaskInfo& left, const TaskInfo& right);
bool operator==(const TaskStatus& left, const TaskStatus& right);
bool operator==(const URL& left, const URL& right);
+bool operator==(const UUID& left, const UUID& right);
bool operator==(const Volume& left, const Volume& right);
bool operator!=(const CheckStatusInfo& left, const CheckStatusInfo& right);
@@ -300,6 +301,12 @@ inline bool operator!=(const TimeInfo& left, const TimeInfo& right)
}
+inline bool operator!=(const UUID& left, const UUID& right)
+{
+ return !(left == right);
+}
+
+
inline bool operator!=(const DurationInfo& left, const DurationInfo& right)
{
return !(left == right);
@@ -441,6 +448,11 @@ std::ostream& operator<<(std::ostream& stream, const TaskInfo& task);
std::ostream& operator<<(std::ostream& stream, const TaskState& state);
+std::ostream& operator<<(
+ std::ostream& stream,
+ const UUID& uuid);
+
+
std::ostream& operator<<(std::ostream& stream, const CheckInfo::Type& type);
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index f1649bb..3090793 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -2230,6 +2230,14 @@ message TaskResourceLimitation {
/**
+ * Describes a UUID.
+ */
+message UUID {
+ required bytes value = 1;
+}
+
+
+/**
* Describes an offer operation, similar to `Offer.Operation`, with
* some additional information.
*/
@@ -2247,7 +2255,7 @@ message OfferOperation {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which is
// optional.
- required bytes operation_uuid = 6;
+ required UUID operation_uuid = 6;
}
@@ -2292,7 +2300,7 @@ message OfferOperationStatus {
// Statuses that are delivered reliably to the scheduler will
// include a `status_uuid`. The status is considered delivered once
// it is acknowledged by the scheduler.
- optional bytes status_uuid = 5;
+ optional UUID status_uuid = 5;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 31e8954..beb9f17 100644
--- a/include/mesos/v1/resource_provider/resource_provider.proto
+++ b/include/mesos/v1/resource_provider/resource_provider.proto
@@ -54,7 +54,7 @@ message Event {
// This is the internal UUID for the operation, which is kept
// independently from the framework specified operation id, which is
// optional.
- required bytes operation_uuid = 3;
+ required UUID operation_uuid = 3;
// Used to establish the relationship between the operation and
// the resources that the operation is operating on. Each resource
@@ -68,13 +68,13 @@ message Event {
// that it maintains, because this means the operation is
// operating on resources that might have already been
// invalidated.
- required bytes resource_version_uuid = 4;
+ required UUID resource_version_uuid = 4;
}
// Received when the master wants to launch a task using resources
// of this resource provider.
message PublishResources {
- required bytes uuid = 1;
+ required UUID uuid = 1;
repeated Resource resources = 2;
}
@@ -82,10 +82,10 @@ message Event {
// Acknowledgements may be generated either by a framework or by the master.
message AcknowledgeOfferOperation {
// The UUID from the `OfferOperationStatus` being acknowledged.
- required bytes status_uuid = 1;
+ required UUID status_uuid = 1;
// The UUID from the relevant `OfferOperation`.
- required bytes operation_uuid = 2;
+ required UUID operation_uuid = 2;
}
// Received when the resource provider manager wants to reconcile its view of
@@ -93,7 +93,7 @@ message Event {
// generate offer operation status updates for any operation UUIDs in this
// message which are unknown to the resource provider.
message ReconcileOfferOperations {
- repeated bytes operation_uuids = 1;
+ repeated UUID operation_uuids = 1;
}
optional Type type = 1;
@@ -133,7 +133,7 @@ message Call {
// This is the internal UUID for the operation, which is kept
// independently from the framework specified operation id, which is
// optional.
- required bytes operation_uuid = 4;
+ required UUID operation_uuid = 4;
}
// Notify the master about the total resources and pending operations.
@@ -157,7 +157,7 @@ message Call {
// that it maintains, because this means the operation is
// operating on resources that might have already been
// invalidated.
- required bytes resource_version_uuid = 3;
+ required UUID resource_version_uuid = 3;
}
message UpdatePublishResourcesStatus {
@@ -167,7 +167,7 @@ message Call {
FAILED = 2;
}
- required bytes uuid = 1;
+ required UUID uuid = 1;
required Status status = 2;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 3bd5bae..f4380e9 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -438,7 +438,7 @@ OfferOperationStatus createOfferOperationStatus(
}
if (statusUUID.isSome()) {
- status.set_status_uuid(statusUUID->toBytes());
+ status.mutable_status_uuid()->set_value(statusUUID->toBytes());
}
return status;
@@ -462,9 +462,9 @@ OfferOperation createOfferOperation(
operation.mutable_info()->CopyFrom(info);
operation.mutable_latest_status()->CopyFrom(latestStatus);
if (operationUUID.isSome()) {
- operation.set_operation_uuid(operationUUID->toBytes());
+ operation.mutable_operation_uuid()->set_value(operationUUID->toBytes());
} else {
- operation.set_operation_uuid(id::UUID::random().toBytes());
+ operation.mutable_operation_uuid()->set_value(id::UUID::random().toBytes());
}
return operation;
@@ -489,7 +489,7 @@ OfferOperationStatusUpdate createOfferOperationStatusUpdate(
if (latestStatus.isSome()) {
update.mutable_latest_status()->CopyFrom(latestStatus.get());
}
- update.set_operation_uuid(operationUUID.toBytes());
+ update.mutable_operation_uuid()->set_value(operationUUID.toBytes());
return update;
}
@@ -869,7 +869,7 @@ RepeatedPtrField<ResourceVersionUUID> createResourceVersions(
if (resourceProviderId.isSome()) {
entry->mutable_resource_provider_id()->CopyFrom(resourceProviderId.get());
}
- entry->set_uuid(uuid.toBytes());
+ entry->mutable_uuid()->set_value(uuid.toBytes());
}
return result;
@@ -891,7 +891,8 @@ hashmap<Option<ResourceProviderID>, id::UUID> parseResourceVersions(
CHECK(!result.contains(resourceProviderId));
- const Try<id::UUID> uuid = id::UUID::fromBytes(resourceVersionUUID.uuid());
+ const Try<id::UUID> uuid =
+ id::UUID::fromBytes(resourceVersionUUID.uuid().value());
CHECK_SOME(uuid);
result.insert({std::move(resourceProviderId), std::move(uuid.get())});
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/common/type_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp
index 65586a5..2ba5302 100644
--- a/src/common/type_utils.cpp
+++ b/src/common/type_utils.cpp
@@ -196,6 +196,12 @@ bool operator==(const URL& left, const URL& right)
}
+bool operator==(const UUID& left, const UUID& right)
+{
+ return left.value() == right.value();
+}
+
+
bool operator==(
const ContainerInfo::DockerInfo::PortMapping& left,
const ContainerInfo::DockerInfo::PortMapping& right)
@@ -792,6 +798,17 @@ ostream& operator<<(ostream& stream, const TaskState& state)
}
+ostream& operator<<(ostream& stream, const UUID& uuid)
+{
+ Try<id::UUID> _uuid = id::UUID::fromBytes(uuid.value());
+ if (_uuid.isError()) {
+ return stream << "INVALID UUID";
+ }
+
+ return stream << _uuid->toString();
+}
+
+
ostream& operator<<(ostream& stream, const CheckInfo::Type& type)
{
return stream << CheckInfo::Type_Name(type);
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index a8353ab..e082da8 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -6300,7 +6300,7 @@ void Master::__registerSlave(
Option<id::UUID> resourceVersion;
if (registerSlaveMessage.has_resource_version_uuid()) {
Try<id::UUID> uuid = id::UUID::fromBytes(
- registerSlaveMessage.resource_version_uuid());
+ registerSlaveMessage.resource_version_uuid().value());
CHECK_SOME(uuid);
resourceVersion = uuid.get();
@@ -6853,7 +6853,7 @@ void Master::__reregisterSlave(
Option<id::UUID> resourceVersion;
if (reregisterSlaveMessage.has_resource_version_uuid()) {
Try<id::UUID> uuid = id::UUID::fromBytes(
- reregisterSlaveMessage.resource_version_uuid());
+ reregisterSlaveMessage.resource_version_uuid().value());
CHECK_SOME(uuid);
resourceVersion = uuid.get();
@@ -6997,7 +6997,7 @@ void Master::___reregisterSlave(
Option<id::UUID> resourceVersion;
if (reregisterSlaveMessage.has_resource_version_uuid()) {
Try<id::UUID> uuid = id::UUID::fromBytes(
- reregisterSlaveMessage.resource_version_uuid());
+ reregisterSlaveMessage.resource_version_uuid().value());
CHECK_SOME(uuid);
resourceVersion = uuid.get();
@@ -7302,7 +7302,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
hashmap<Option<ResourceProviderID>, id::UUID> resourceVersions;
const Try<id::UUID> slaveResourceVersion =
- id::UUID::fromBytes(message.resource_version_uuid());
+ id::UUID::fromBytes(message.resource_version_uuid().value());
CHECK_SOME(slaveResourceVersion);
resourceVersions.insert({None(), slaveResourceVersion.get()});
@@ -7315,7 +7315,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
}
Try<id::UUID> resourceVersion =
- id::UUID::fromBytes(resourceProvider.resource_version_uuid());
+ id::UUID::fromBytes(resourceProvider.resource_version_uuid().value());
CHECK_SOME(resourceVersion);
@@ -7340,7 +7340,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
const OfferOperation& operation,
message.offer_operations().operations()) {
Try<id::UUID> operationUuid =
- id::UUID::fromBytes(operation.operation_uuid());
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(operationUuid);
receivedOfferOperations.insert(operationUuid.get());
}
@@ -7353,7 +7353,7 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
const OfferOperation& operation,
resourceProvider.operations().operations()) {
Try<id::UUID> operationUuid =
- id::UUID::fromBytes(operation.operation_uuid());
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(operationUuid);
receivedOfferOperations.insert(operationUuid.get());
}
@@ -7448,7 +7448,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
foreach (
const OfferOperation& operation,
message.offer_operations().operations()) {
- Try<id::UUID> uuid = id::UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> uuid =
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(uuid) << "Could not deserialize operation id when reconciling "
"offer operations";
@@ -7477,7 +7478,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
foreach (
const OfferOperation& operation,
resourceProvider.operations().operations()) {
- Try<id::UUID> uuid = id::UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> uuid =
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(uuid)
<< "Could not deserialize operation id when reconciling "
"offer operations";
@@ -7660,7 +7662,8 @@ void Master::updateSlave(UpdateSlaveMessage&& message)
ReconcileOfferOperationsMessage::Operation* reconcileOperation =
reconcile.add_operations();
- reconcileOperation->set_operation_uuid(uuid.toBytes());
+ reconcileOperation->mutable_operation_uuid()->set_value(
+ uuid.toBytes());
if (providerId.isSome()) {
reconcileOperation->mutable_resource_provider_id()
@@ -7942,7 +7945,7 @@ void Master::offerOperationStatusUpdate(
? update.framework_id()
: Option<FrameworkID>::none();
- Try<id::UUID> uuid = id::UUID::fromBytes(update.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.operation_uuid().value());
if (uuid.isError()) {
LOG(ERROR) << "Failed to parse offer operation UUID for operation "
<< "'" << update.status().operation_id() << "' for "
@@ -8023,9 +8026,10 @@ void Master::offerOperationStatusUpdate(
CHECK_SOME(resourceProviderId);
OfferOperationUpdateAcknowledgementMessage acknowledgement;
- acknowledgement.set_status_uuid(
+ acknowledgement.mutable_status_uuid()->CopyFrom(
operation->statuses(operation->statuses_size() - 1).status_uuid());
- acknowledgement.set_operation_uuid(operation->operation_uuid());
+ acknowledgement.mutable_operation_uuid()->CopyFrom(
+ operation->operation_uuid());
acknowledgement.mutable_resource_provider_id()
->CopyFrom(resourceProviderId.get());
@@ -10358,11 +10362,8 @@ void Master::updateOfferOperation(
operation->add_statuses()->CopyFrom(status);
- Try<id::UUID> uuid = id::UUID::fromBytes(update.operation_uuid());
- CHECK_SOME(uuid);
-
LOG(INFO) << "Updating the state of offer operation '"
- << operation->info().id() << "' (uuid: " << uuid->toString()
+ << operation->info().id() << "' (uuid: " << update.operation_uuid()
<< ") of framework " << operation->framework_id()
<< " (latest state: " << operation->latest_status().state()
<< ", status update state: " << status.state() << ")";
@@ -10563,22 +10564,19 @@ void Master::_apply(
message.mutable_framework_id()->CopyFrom(framework->id());
}
message.mutable_operation_info()->CopyFrom(offerOperation->info());
- message.set_operation_uuid(offerOperation->operation_uuid());
+ message.mutable_operation_uuid()->CopyFrom(
+ offerOperation->operation_uuid());
if (resourceProviderId.isSome()) {
message.mutable_resource_version_uuid()
->mutable_resource_provider_id()
->CopyFrom(resourceProviderId.get());
}
- message.mutable_resource_version_uuid()
- ->set_uuid(resourceVersion->toBytes());
-
- Try<id::UUID> operationUUID =
- id::UUID::fromBytes(offerOperation->operation_uuid());
- CHECK_SOME(operationUUID);
+ message.mutable_resource_version_uuid()->mutable_uuid()->set_value(
+ resourceVersion->toBytes());
LOG(INFO) << "Sending offer operation '"
<< offerOperation->info().id()
- << "' (uuid: " << operationUUID->toString()
+ << "' (uuid: " << offerOperation->operation_uuid()
<< ") to agent " << *slave;
send(slave->pid, message);
@@ -11482,7 +11480,7 @@ void Slave::removeTask(Task* task)
void Slave::addOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
offerOperations.put(uuid.get(), operation);
@@ -11533,7 +11531,7 @@ void Slave::recoverResources(OfferOperation* operation)
void Slave::removeOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
CHECK(offerOperations.contains(uuid.get()))
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 004be71..b800cda 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -2462,7 +2462,8 @@ struct Framework
const FrameworkID& frameworkId = operation->framework_id();
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid =
+ id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
CHECK(!offerOperations.contains(uuid.get()))
@@ -2549,7 +2550,8 @@ struct Framework
void removeOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid =
+ id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
CHECK(offerOperations.contains(uuid.get()))
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/messages/messages.cpp
----------------------------------------------------------------------
diff --git a/src/messages/messages.cpp b/src/messages/messages.cpp
index 9efbe7f..ac8f6c3 100644
--- a/src/messages/messages.cpp
+++ b/src/messages/messages.cpp
@@ -129,14 +129,12 @@ ostream& operator<<(ostream& stream, const OfferOperationStatusUpdate& update)
stream << update.status().state();
if (update.status().has_status_uuid()) {
- stream << " (Status UUID: "
- << stringify(
- id::UUID::fromBytes(update.status().status_uuid()).get())
+ stream << " (Status UUID: " << stringify(update.status().status_uuid())
<< ")";
}
stream << " for operation UUID "
- << stringify(id::UUID::fromBytes(update.operation_uuid()).get());
+ << stringify(update.operation_uuid());
if (update.status().has_operation_id()) {
stream << " (framework-supplied ID '" << update.status().operation_id()
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/messages/messages.proto
----------------------------------------------------------------------
diff --git a/src/messages/messages.proto b/src/messages/messages.proto
index b8eb8fa..baefbe9 100644
--- a/src/messages/messages.proto
+++ b/src/messages/messages.proto
@@ -410,10 +410,10 @@ message StatusUpdateAcknowledgementMessage {
*/
message OfferOperationUpdateAcknowledgementMessage {
// The UUID from the `OfferOperationStatus` being acknowledged.
- required bytes status_uuid = 1;
+ required UUID status_uuid = 1;
// The UUID from the relevant `OfferOperation`.
- required bytes operation_uuid = 2;
+ required UUID operation_uuid = 2;
optional ResourceProviderID resource_provider_id = 3;
}
@@ -466,7 +466,7 @@ message ReconcileTasksMessage {
*/
message ReconcileOfferOperationsMessage {
message Operation {
- required bytes operation_uuid = 1;
+ required UUID operation_uuid = 1;
optional ResourceProviderID resource_provider_id = 2;
}
@@ -526,7 +526,7 @@ message RegisterSlaveMessage {
// different resource version UUID than that it maintains, because
// this means the operation is operating on resources that might
// have already been invalidated.
- optional bytes resource_version_uuid = 5;
+ optional UUID resource_version_uuid = 5;
}
@@ -585,7 +585,7 @@ message ReregisterSlaveMessage {
// different resource version UUID than that it maintains, because
// this means the operation is operating on resources that might
// have already been invalidated.
- optional bytes resource_version_uuid = 10;
+ optional UUID resource_version_uuid = 10;
}
@@ -704,7 +704,7 @@ message ResourceVersionUUID {
// If not set, it represents resources directly from the agent (not
// having a backing resource provider).
optional ResourceProviderID resource_provider_id = 1;
- required bytes uuid = 2;
+ required UUID uuid = 2;
}
@@ -752,14 +752,14 @@ message UpdateSlaveMessage {
// should reject operations that have a different resource version
// UUID than that it maintains, because this means the operation is
// operating on resources that might have already been invalidated.
- optional bytes resource_version_uuid = 7;
+ optional UUID resource_version_uuid = 7;
// Describes an agent-local resource provider.
message ResourceProvider {
optional ResourceProviderInfo info = 1;
repeated Resource total_resources = 2;
required OfferOperations operations = 3;
- required bytes resource_version_uuid = 4;
+ required UUID resource_version_uuid = 4;
}
message ResourceProviders {
@@ -788,7 +788,7 @@ message OfferOperationStatusUpdate {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which is
// optional.
- required bytes operation_uuid = 5;
+ required UUID operation_uuid = 5;
}
@@ -809,7 +809,7 @@ message OfferOperationStatusUpdateRecord {
optional OfferOperationStatusUpdate update = 2;
// Required if type == ACK.
- optional bytes uuid = 3;
+ optional UUID uuid = 3;
}
@@ -828,7 +828,7 @@ message ApplyOfferOperationMessage {
// This is the internal UUID for the operation, which is kept
// independently from the framework-specified operation ID, which is
// optional.
- required bytes operation_uuid = 3;
+ required UUID operation_uuid = 3;
// Used to establish the relationship between the operation and the
// resources that the operation is operating on. Each resource
@@ -857,7 +857,7 @@ message ResourceProviderCallMessage {
// resource provider ID hasn't been assigned yet. This 'uuid' will
// be echoed back in the corresponding 'Subscribed' Event, allowing
// the agent to tell which resource provider the Event is for.
- optional bytes uuid = 2;
+ optional UUID uuid = 2;
}
@@ -871,7 +871,7 @@ message ResourceProviderEventMessage {
required resource_provider.Event event = 2;
// See the comments in 'ResourceProviderCallMessage'.
- optional bytes uuid = 3;
+ optional UUID uuid = 3;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/resource_provider/manager.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/manager.cpp b/src/resource_provider/manager.cpp
index d9e0d25..2a167aa 100644
--- a/src/resource_provider/manager.cpp
+++ b/src/resource_provider/manager.cpp
@@ -349,21 +349,14 @@ void ResourceProviderManagerProcess::applyOfferOperation(
{
const Offer::Operation& operation = message.operation_info();
const FrameworkID& frameworkId = message.framework_id();
-
- Try<id::UUID> uuid = id::UUID::fromBytes(message.operation_uuid());
- if (uuid.isError()) {
- LOG(ERROR) << "Failed to parse offer operation UUID for operation "
- << "'" << operation.id() << "' from framework "
- << frameworkId << ": " << uuid.error();
- return;
- }
+ const UUID& operationUUID = message.operation_uuid();
Result<ResourceProviderID> resourceProviderId =
getResourceProviderId(operation);
if (!resourceProviderId.isSome()) {
LOG(ERROR) << "Failed to get the resource provider ID of operation "
- << "'" << operation.id() << "' (uuid: " << uuid->toString()
+ << "'" << operation.id() << "' (uuid: " << operationUUID
<< ") from framework " << frameworkId << ": "
<< (resourceProviderId.isError() ? resourceProviderId.error()
: "Not found");
@@ -372,7 +365,7 @@ void ResourceProviderManagerProcess::applyOfferOperation(
if (!resourceProviders.subscribed.contains(resourceProviderId.get())) {
LOG(WARNING) << "Dropping operation '" << operation.id() << "' (uuid: "
- << uuid.get() << ") from framework " << frameworkId
+ << operationUUID << ") from framework " << frameworkId
<< " because resource provider " << resourceProviderId.get()
<< " is not subscribed";
return;
@@ -396,13 +389,14 @@ void ResourceProviderManagerProcess::applyOfferOperation(
->mutable_framework_id()->CopyFrom(frameworkId);
event.mutable_apply_offer_operation()->mutable_info()->CopyFrom(operation);
event.mutable_apply_offer_operation()
- ->set_operation_uuid(message.operation_uuid());
- event.mutable_apply_offer_operation()->set_resource_version_uuid(
- message.resource_version_uuid().uuid());
+ ->mutable_operation_uuid()->CopyFrom(message.operation_uuid());
+ event.mutable_apply_offer_operation()
+ ->mutable_resource_version_uuid()
+ ->CopyFrom(message.resource_version_uuid().uuid());
if (!resourceProvider->http.send(event)) {
LOG(WARNING) << "Failed to send operation '" << operation.id() << "' "
- << "(uuid: " << uuid.get() << ") from framework "
+ << "(uuid: " << operationUUID << ") from framework "
<< frameworkId << " to resource provider "
<< resourceProviderId.get() << ": connection closed";
}
@@ -429,9 +423,11 @@ void ResourceProviderManagerProcess::acknowledgeOfferOperationUpdate(
Event event;
event.set_type(Event::ACKNOWLEDGE_OFFER_OPERATION);
event.mutable_acknowledge_offer_operation()
- ->set_status_uuid(message.status_uuid());
+ ->mutable_status_uuid()
+ ->CopyFrom(message.status_uuid());
event.mutable_acknowledge_offer_operation()
- ->set_operation_uuid(message.operation_uuid());
+ ->mutable_operation_uuid()
+ ->CopyFrom(message.operation_uuid());
if (!resourceProvider.http.send(event)) {
LOG(WARNING) << "Failed to send offer operation update acknowledgement with"
@@ -455,12 +451,12 @@ void ResourceProviderManagerProcess::reconcileOfferOperations(
if (events.contains(resourceProviderId)) {
events.at(resourceProviderId).mutable_reconcile_offer_operations()
- ->add_operation_uuids(operation.operation_uuid());
+ ->add_operation_uuids()->CopyFrom(operation.operation_uuid());
} else {
Event event;
event.set_type(Event::RECONCILE_OFFER_OPERATIONS);
event.mutable_reconcile_offer_operations()
- ->add_operation_uuids(operation.operation_uuid());
+ ->add_operation_uuids()->CopyFrom(operation.operation_uuid());
events[resourceProviderId] = event;
}
@@ -538,7 +534,8 @@ Future<Nothing> ResourceProviderManagerProcess::publishResources(
Event event;
event.set_type(Event::PUBLISH_RESOURCES);
- event.mutable_publish_resources()->set_uuid(uuid.toBytes());
+ event.mutable_publish_resources()
+ ->mutable_uuid()->set_value(uuid.toBytes());
event.mutable_publish_resources()->mutable_resources()->CopyFrom(resources);
ResourceProvider* resourceProvider =
@@ -633,7 +630,7 @@ void ResourceProviderManagerProcess::updateOfferOperationStatus(
ResourceProviderMessage::UpdateOfferOperationStatus body;
body.update.mutable_framework_id()->CopyFrom(update.framework_id());
body.update.mutable_status()->CopyFrom(update.status());
- body.update.set_operation_uuid(update.operation_uuid());
+ body.update.mutable_operation_uuid()->CopyFrom(update.operation_uuid());
if (update.has_latest_status()) {
body.update.mutable_latest_status()->CopyFrom(update.latest_status());
}
@@ -657,7 +654,7 @@ void ResourceProviderManagerProcess::updateState(
// TODO(chhsiao): Report pending operations.
Try<id::UUID> resourceVersion =
- id::UUID::fromBytes(update.resource_version_uuid());
+ id::UUID::fromBytes(update.resource_version_uuid().value());
CHECK_SOME(resourceVersion)
<< "Could not deserialize version of resource provider "
@@ -665,7 +662,8 @@ void ResourceProviderManagerProcess::updateState(
hashmap<id::UUID, OfferOperation> offerOperations;
foreach (const OfferOperation &operation, update.operations()) {
- Try<id::UUID> uuid = id::UUID::fromBytes(operation.operation_uuid());
+ Try<id::UUID> uuid =
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(uuid);
offerOperations.put(uuid.get(), operation);
@@ -693,7 +691,7 @@ void ResourceProviderManagerProcess::updatePublishResourcesStatus(
ResourceProvider* resourceProvider,
const Call::UpdatePublishResourcesStatus& update)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(update.uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(update.uuid().value());
if (uuid.isError()) {
LOG(ERROR) << "Invalid UUID in UpdatePublishResourcesStatus from resource"
<< " provider " << resourceProvider->info.id()
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/resource_provider/message.hpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/message.hpp b/src/resource_provider/message.hpp
index bac3ffb..6236693 100644
--- a/src/resource_provider/message.hpp
+++ b/src/resource_provider/message.hpp
@@ -95,12 +95,9 @@ inline std::ostream& operator<<(
CHECK_SOME(updateOfferOperationStatus);
- Try<id::UUID> operationUUID = id::UUID::fromBytes(
- updateOfferOperationStatus->update.operation_uuid());
- CHECK_SOME(operationUUID);
-
return stream
- << "UPDATE_OFFER_OPERATION_STATUS: (uuid: " << operationUUID.get()
+ << "UPDATE_OFFER_OPERATION_STATUS: (uuid: "
+ << updateOfferOperationStatus->update.operation_uuid()
<< ") for framework "
<< updateOfferOperationStatus->update.framework_id()
<< " (latest state: "
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index ba9f1f8..9d0e9de 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -1543,7 +1543,8 @@ void Slave::doReliableRegistration(Duration maxBackoff)
// Include checkpointed resources.
message.mutable_checkpointed_resources()->CopyFrom(checkpointedResources_);
- message.set_resource_version_uuid(resourceVersion.toBytes());
+ message.mutable_resource_version_uuid()->set_value(
+ resourceVersion.toBytes());
send(master.get(), message);
} else {
@@ -1557,7 +1558,8 @@ void Slave::doReliableRegistration(Duration maxBackoff)
// Include checkpointed resources.
message.mutable_checkpointed_resources()->CopyFrom(checkpointedResources_);
- message.set_resource_version_uuid(resourceVersion.toBytes());
+ message.mutable_resource_version_uuid()->set_value(
+ resourceVersion.toBytes());
message.mutable_slave()->CopyFrom(slaveInfo);
@@ -3807,7 +3809,7 @@ void Slave::applyOfferOperation(const ApplyOfferOperationMessage& message)
? message.framework_id()
: Option<FrameworkID>::none();
- Try<id::UUID> uuid = id::UUID::fromBytes(message.operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(message.operation_uuid().value());
if (uuid.isError()) {
LOG(ERROR) << "Failed to parse offer operation UUID for operation "
<< "'" << message.operation_info().id() << "' from "
@@ -3906,7 +3908,7 @@ void Slave::reconcileOfferOperations(
}
Try<id::UUID> operationUuid =
- id::UUID::fromBytes(operation.operation_uuid());
+ id::UUID::fromBytes(operation.operation_uuid().value());
CHECK_SOME(operationUuid);
// The master reconciles when it notices that an operation is missing from
@@ -3991,7 +3993,7 @@ void Slave::offerOperationUpdateAcknowledgement(
const OfferOperationUpdateAcknowledgementMessage& acknowledgement)
{
Try<id::UUID> operationUuid =
- id::UUID::fromBytes(acknowledgement.operation_uuid());
+ id::UUID::fromBytes(acknowledgement.operation_uuid().value());
CHECK_SOME(operationUuid);
OfferOperation* operation = getOfferOperation(operationUuid.get());
@@ -7022,7 +7024,7 @@ UpdateSlaveMessage Slave::generateResourceProviderUpdate() const
UpdateSlaveMessage message;
message.mutable_slave_id()->CopyFrom(info.id());
message.set_update_oversubscribed_resources(false);
- message.set_resource_version_uuid(resourceVersion.toBytes());
+ message.mutable_resource_version_uuid()->set_value(resourceVersion.toBytes());
message.mutable_offer_operations();
foreachvalue (const OfferOperation* operation, offerOperations) {
@@ -7043,7 +7045,7 @@ UpdateSlaveMessage Slave::generateResourceProviderUpdate() const
resourceProvider->info);
provider->mutable_total_resources()->CopyFrom(
resourceProvider->totalResources);
- provider->set_resource_version_uuid(
+ provider->mutable_resource_version_uuid()->set_value(
resourceProvider->resourceVersion.toBytes());
provider->mutable_operations();
@@ -7228,7 +7230,7 @@ void Slave::handleResourceProviderMessage(
message->updateOfferOperationStatus->update;
Try<id::UUID> operationUUID =
- id::UUID::fromBytes(update.operation_uuid());
+ id::UUID::fromBytes(update.operation_uuid().value());
CHECK_SOME(operationUUID);
OfferOperation* operation = getOfferOperation(operationUUID.get());
@@ -7352,7 +7354,7 @@ void Slave::handleResourceProviderMessage(
void Slave::addOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
offerOperations.put(uuid.get(), operation);
@@ -7430,13 +7432,9 @@ void Slave::updateOfferOperation(
operation->add_statuses()->CopyFrom(status);
}
- Try<id::UUID> operationUUID =
- id::UUID::fromBytes(operation->operation_uuid());
- CHECK_SOME(operationUUID);
-
LOG(INFO) << "Updating the state of offer operation '"
<< operation->info().id()
- << "' (uuid: " << operationUUID.get()
+ << "' (uuid: " << operation->operation_uuid()
<< ") of framework " << operation->framework_id()
<< " (latest state: " << operation->latest_status().state()
<< ", status update state: " << status.state() << ")";
@@ -7491,7 +7489,7 @@ void Slave::updateOfferOperation(
void Slave::removeOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
Result<ResourceProviderID> resourceProviderId =
@@ -9167,7 +9165,7 @@ Resources Executor::allocatedResources() const
void ResourceProvider::addOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
CHECK(!offerOperations.contains(uuid.get()))
@@ -9179,7 +9177,7 @@ void ResourceProvider::addOfferOperation(OfferOperation* operation)
void ResourceProvider::removeOfferOperation(OfferOperation* operation)
{
- Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid());
+ Try<id::UUID> uuid = id::UUID::fromBytes(operation->operation_uuid().value());
CHECK_SOME(uuid);
CHECK(offerOperations.contains(uuid.get()))
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 f27571f..9df4973 100644
--- a/src/status_update_manager/offer_operation.cpp
+++ b/src/status_update_manager/offer_operation.cpp
@@ -72,7 +72,8 @@ Future<Nothing> OfferOperationStatusUpdateManager::update(
const OfferOperationStatusUpdate& update,
bool checkpoint)
{
- Try<id::UUID> operationUuid = id::UUID::fromBytes(update.operation_uuid());
+ Try<id::UUID> operationUuid =
+ id::UUID::fromBytes(update.operation_uuid().value());
CHECK_SOME(operationUuid);
return dispatch(
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 6953852..e575d8c 100644
--- a/src/status_update_manager/status_update_manager_process.hpp
+++ b/src/status_update_manager/status_update_manager_process.hpp
@@ -702,7 +702,7 @@ private:
if (update.isNone()) {
return Error(
"Unexpected " + statusUpdateType + " acknowledgment"
- " (UUID: " + id::UUID::fromBytes(record->uuid())->toString() +
+ " (UUID: " + stringify(record->uuid()) +
") for stream " + stringify(streamId));
}
stream->_handle(update.get(), record->type());
@@ -785,7 +785,7 @@ private:
return Error("Status update is missing 'status_uuid'");
}
Try<id::UUID> statusUuid =
- id::UUID::fromBytes(update.status().status_uuid());
+ id::UUID::fromBytes(update.status().status_uuid().value());
CHECK_SOME(statusUuid);
// Check that this status update has not already been acknowledged.
@@ -849,7 +849,7 @@ private:
// make the `TaskStatusUpdateManager` use this process, we should avoid
// depending on identical field names.
Try<id::UUID> updateStatusUuid =
- id::UUID::fromBytes(update.status().status_uuid());
+ id::UUID::fromBytes(update.status().status_uuid().value());
CHECK_SOME(updateStatusUuid);
// This might happen if we retried a status update and got back
@@ -940,7 +940,7 @@ private:
// field 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.
- record.set_uuid(update.status().status_uuid());
+ record.mutable_uuid()->CopyFrom(update.status().status_uuid());
break;
}
@@ -971,7 +971,7 @@ private:
// make the `TaskStatusUpdateManager` use this process, we should avoid
// depending on identical field names.
Try<id::UUID> statusUuid =
- id::UUID::fromBytes(update.status().status_uuid());
+ id::UUID::fromBytes(update.status().status_uuid().value());
CHECK_SOME(statusUuid);
switch (type) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 821cce3..6207d62 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -2996,7 +2996,8 @@ public:
typename Call::UpdateState* update = call.mutable_update_state();
update->mutable_resources()->CopyFrom(injected);
- update->set_resource_version_uuid(id::UUID::random().toBytes());
+ update->mutable_resource_version_uuid()->set_value(
+ id::UUID::random().toBytes());
driver->send(call);
}
@@ -3013,7 +3014,7 @@ public:
typename Call::UpdateOfferOperationStatus* update =
call.mutable_update_offer_operation_status();
update->mutable_framework_id()->CopyFrom(operation.framework_id());
- update->set_operation_uuid(operation.operation_uuid());
+ update->mutable_operation_uuid()->CopyFrom(operation.operation_uuid());
update->mutable_status()->set_state(
OfferOperationState::OFFER_OPERATION_FINISHED);
@@ -3089,7 +3090,7 @@ public:
typename Call::UpdatePublishResourcesStatus* update =
call.mutable_update_publish_resources_status();
- update->set_uuid(publish.uuid());
+ update->mutable_uuid()->CopyFrom(publish.uuid());
update->set_status(Call::UpdatePublishResourcesStatus::OK);
driver->send(call);
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/tests/offer_operation_status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/offer_operation_status_update_manager_tests.cpp b/src/tests/offer_operation_status_update_manager_tests.cpp
index 4c92e86..cb71bc1 100644
--- a/src/tests/offer_operation_status_update_manager_tests.cpp
+++ b/src/tests/offer_operation_status_update_manager_tests.cpp
@@ -95,7 +95,7 @@ protected:
{
OfferOperationStatusUpdate statusUpdate;
- statusUpdate.set_operation_uuid(operationUuid.toBytes());
+ statusUpdate.mutable_operation_uuid()->set_value(operationUuid.toBytes());
if (frameworkId.isSome()) {
statusUpdate.mutable_framework_id()->CopyFrom(frameworkId.get());
@@ -103,7 +103,7 @@ protected:
OfferOperationStatus* status = statusUpdate.mutable_status();
status->set_state(state);
- status->set_status_uuid(statusUuid.toBytes());
+ status->mutable_status_uuid()->set_value(statusUuid.toBytes());
return statusUpdate;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 b5edc6d..4e86016 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -319,7 +319,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState)
Call::UpdateState* updateState = call.mutable_update_state();
updateState->mutable_resources()->CopyFrom(v1::Resources(resources));
- updateState->set_resource_version_uuid(id::UUID::random().toBytes());
+ updateState->mutable_resource_version_uuid()->set_value(
+ id::UUID::random().toBytes());
http::Request request;
request.method = "POST";
@@ -418,7 +419,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
mesos::v1::OfferOperationStatus status;
status.set_state(mesos::v1::OfferOperationState::OFFER_OPERATION_FINISHED);
- id::UUID operationUUID = id::UUID::random();
+ mesos::v1::UUID operationUUID;
+ operationUUID.set_value(id::UUID::random().toBytes());
Call call;
call.set_type(Call::UPDATE_OFFER_OPERATION_STATUS);
@@ -428,7 +430,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
call.mutable_update_offer_operation_status();
updateOfferOperationStatus->mutable_framework_id()->CopyFrom(frameworkId);
updateOfferOperationStatus->mutable_status()->CopyFrom(status);
- updateOfferOperationStatus->set_operation_uuid(operationUUID.toBytes());
+ updateOfferOperationStatus->mutable_operation_uuid()->CopyFrom(
+ operationUUID);
http::Request request;
request.method = "POST";
@@ -458,8 +461,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
devolve(status).state(),
message->updateOfferOperationStatus->update.status().state());
EXPECT_EQ(
- operationUUID.toBytes(),
- message->updateOfferOperationStatus->update.operation_uuid());
+ operationUUID.value(),
+ message->updateOfferOperationStatus->update.operation_uuid().value());
}
}
@@ -550,7 +553,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess)
Call::UpdatePublishResourcesStatus* update =
call.mutable_update_publish_resources_status();
- update->set_uuid(event->get().publish_resources().uuid());
+ update->mutable_uuid()->CopyFrom(event->get().publish_resources().uuid());
update->set_status(Call::UpdatePublishResourcesStatus::OK);
http::Request request;
@@ -657,7 +660,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure)
Call::UpdatePublishResourcesStatus* update =
call.mutable_update_publish_resources_status();
- update->set_uuid(event->get().publish_resources().uuid());
+ update->mutable_uuid()->CopyFrom(event->get().publish_resources().uuid());
update->set_status(Call::UpdatePublishResourcesStatus::FAILED);
http::Request request;
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/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 22c7742..db7b431 100644
--- a/src/tests/resource_provider_validation_tests.cpp
+++ b/src/tests/resource_provider_validation_tests.cpp
@@ -74,7 +74,7 @@ TEST(ResourceProviderCallValidationTest, UpdateOfferOperationStatus)
call.mutable_update_offer_operation_status();
update->mutable_framework_id()->set_value(id::UUID::random().toString());
- update->set_operation_uuid(id::UUID::random().toBytes());
+ update->mutable_operation_uuid()->set_value(id::UUID::random().toBytes());
OfferOperationStatus* status = update->mutable_status();
status->mutable_operation_id()->set_value(id::UUID::random().toString());
@@ -102,7 +102,8 @@ TEST(ResourceProviderCallValidationTest, UpdateState)
EXPECT_SOME(error);
Call::UpdateState* updateState = call.mutable_update_state();
- updateState->set_resource_version_uuid(id::UUID::random().toBytes());
+ updateState->mutable_resource_version_uuid()->set_value(
+ id::UUID::random().toBytes());
error = call::validate(call);
EXPECT_NONE(error);
http://git-wip-us.apache.org/repos/asf/mesos/blob/605b238d/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 122f42d..b87015d 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -8765,7 +8765,8 @@ TEST_F(SlaveTest, ResourceProviderSubscribe)
updateState->mutable_resources()->CopyFrom(
v1::Resources(resourceProviderResources));
- updateState->set_resource_version_uuid(resourceVersionUuid);
+ updateState->mutable_resource_version_uuid()->set_value(
+ resourceVersionUuid);
resourceProvider.send(call);
}
@@ -8784,7 +8785,7 @@ TEST_F(SlaveTest, ResourceProviderSubscribe)
EXPECT_EQ(
resourceVersionUuid,
- receivedResourceProvider.resource_version_uuid());
+ receivedResourceProvider.resource_version_uuid().value());
}
@@ -9283,13 +9284,14 @@ TEST_F(SlaveTest, ResourceProviderReconciliation)
v1::resource_provider::Call::UpdateState* updateState =
call.mutable_update_state();
- updateState->set_resource_version_uuid(resourceVersionUuid.toBytes());
+ updateState->mutable_resource_version_uuid()->set_value(
+ resourceVersionUuid.toBytes());
updateState->mutable_resources()->CopyFrom(resourceProviderResources_);
mesos::v1::OfferOperation* _operation = updateState->add_operations();
_operation->mutable_framework_id()->CopyFrom(operation->framework_id());
_operation->mutable_info()->CopyFrom(operation->info());
- _operation->set_operation_uuid(operation->operation_uuid());
+ _operation->mutable_operation_uuid()->CopyFrom(operation->operation_uuid());
mesos::v1::OfferOperationStatus* lastStatus =
_operation->mutable_latest_status();
@@ -9451,7 +9453,8 @@ TEST_F(SlaveTest, RunTaskResourceVersions)
v1::resource_provider::Call::UpdateState* updateState =
call.mutable_update_state();
- updateState->set_resource_version_uuid(id::UUID::random().toBytes());
+ updateState->mutable_resource_version_uuid()->set_value(
+ id::UUID::random().toBytes());
updateState->mutable_resources()->CopyFrom(resourceProviderResources_);
AWAIT_READY(resourceProvider.send(call));
[2/6] mesos git commit: Mesos: Used a namespace for UUID.
Posted by bb...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 451ad21..122f42d 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -982,7 +982,7 @@ TEST_F(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo)
task.mutable_command()->MergeFrom(echoAuthorCommand());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ContainerInfo* container = task.mutable_container();
container->set_type(ContainerInfo::MESOS);
@@ -998,7 +998,7 @@ TEST_F(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo)
ASSERT_SOME(sandbox);
SlaveID slaveID;
- slaveID.set_value(UUID::random().toString());
+ slaveID.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launch = containerizer->launch(
containerId,
createContainerConfig(task, executor, sandbox.get(), "nobody"),
@@ -2226,7 +2226,7 @@ TEST_F(SlaveTest, HTTPExecutorBadAuthentication)
parentContainerId.set_value(principal->claims.at("cid"));
v1::ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
containerId.mutable_parent()->CopyFrom(parentContainerId);
v1::agent::Call call;
@@ -8752,7 +8752,7 @@ TEST_F(SlaveTest, ResourceProviderSubscribe)
resourceProviderResources.mutable_provider_id()->CopyFrom(resourceProviderId);
- const string resourceVersionUuid = UUID::random().toBytes();
+ const string resourceVersionUuid = id::UUID::random().toBytes();
{
mesos::v1::resource_provider::Call call;
@@ -9273,7 +9273,7 @@ TEST_F(SlaveTest, ResourceProviderReconciliation)
}
// Update the resource version of the resource provider.
- UUID resourceVersionUuid = UUID::random();
+ id::UUID resourceVersionUuid = id::UUID::random();
v1::resource_provider::Call call;
@@ -9451,7 +9451,7 @@ TEST_F(SlaveTest, RunTaskResourceVersions)
v1::resource_provider::Call::UpdateState* updateState =
call.mutable_update_state();
- updateState->set_resource_version_uuid(UUID::random().toBytes());
+ updateState->set_resource_version_uuid(id::UUID::random().toBytes());
updateState->mutable_resources()->CopyFrom(resourceProviderResources_);
AWAIT_READY(resourceProvider.send(call));
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_validation_tests.cpp b/src/tests/slave_validation_tests.cpp
index d6e0931..d8bc142 100644
--- a/src/tests/slave_validation_tests.cpp
+++ b/src/tests/slave_validation_tests.cpp
@@ -285,7 +285,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer)
// Valid `container_id` but missing `container_id.parent`.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->CopyFrom(containerId);
@@ -296,7 +296,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer)
// an invalid environment variable to check that the common validation
// code for the command's environment is being executed.
ContainerID parentContainerId;
- parentContainerId.set_value(UUID::random().toString());
+ parentContainerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->mutable_parent()->CopyFrom(parentContainerId);
launch->mutable_command()->CopyFrom(createCommandInfo("exit 0"));
@@ -323,7 +323,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainer)
// Any number of parents is valid.
ContainerID grandparentContainerId;
- grandparentContainerId.set_value(UUID::random().toString());
+ grandparentContainerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->mutable_parent()->mutable_parent()
->CopyFrom(grandparentContainerId);
@@ -344,7 +344,7 @@ TEST(AgentCallValidationTest, WaitNestedContainer)
// Expecting a `container_id.parent`.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
agent::Call::WaitNestedContainer* wait =
call.mutable_wait_nested_container();
@@ -356,7 +356,7 @@ TEST(AgentCallValidationTest, WaitNestedContainer)
// Test the valid case.
ContainerID parentContainerId;
- parentContainerId.set_value(UUID::random().toString());
+ parentContainerId.set_value(id::UUID::random().toString());
wait->mutable_container_id()->mutable_parent()->CopyFrom(containerId);
@@ -376,7 +376,7 @@ TEST(AgentCallValidationTest, KillNestedContainer)
// Expecting a `container_id.parent`.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
agent::Call::KillNestedContainer* kill =
call.mutable_kill_nested_container();
@@ -388,7 +388,7 @@ TEST(AgentCallValidationTest, KillNestedContainer)
// Test the valid case.
ContainerID parentContainerId;
- parentContainerId.set_value(UUID::random().toString());
+ parentContainerId.set_value(id::UUID::random().toString());
kill->mutable_container_id()->mutable_parent()->CopyFrom(containerId);
@@ -408,7 +408,7 @@ TEST(AgentCallValidationTest, RemoveNestedContainer)
// Expecting a `container_id.parent`.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
agent::Call::RemoveNestedContainer* removeNestedContainer =
call.mutable_remove_nested_container();
@@ -420,7 +420,7 @@ TEST(AgentCallValidationTest, RemoveNestedContainer)
// Test the valid case.
ContainerID parentContainerId;
- parentContainerId.set_value(UUID::random().toString());
+ parentContainerId.set_value(id::UUID::random().toString());
removeNestedContainer->mutable_container_id()->mutable_parent()->CopyFrom(
containerId);
@@ -453,7 +453,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession)
// Valid `container_id` but missing `container_id.parent`.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->CopyFrom(containerId);
@@ -464,7 +464,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession)
// an invalid environment variable to check that the common validation
// code for the command's environment is being executed.
ContainerID parentContainerId;
- parentContainerId.set_value(UUID::random().toString());
+ parentContainerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->mutable_parent()->CopyFrom(parentContainerId);
launch->mutable_command()->CopyFrom(createCommandInfo("exit 0"));
@@ -491,7 +491,7 @@ TEST(AgentCallValidationTest, LaunchNestedContainerSession)
// Any number of parents is valid.
ContainerID grandparentContainerId;
- grandparentContainerId.set_value(UUID::random().toString());
+ grandparentContainerId.set_value(id::UUID::random().toString());
launch->mutable_container_id()->mutable_parent()->mutable_parent()->CopyFrom(
grandparentContainerId);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/task_status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/task_status_update_manager_tests.cpp b/src/tests/task_status_update_manager_tests.cpp
index d180e8c..0c8b058 100644
--- a/src/tests/task_status_update_manager_tests.cpp
+++ b/src/tests/task_status_update_manager_tests.cpp
@@ -442,7 +442,7 @@ TEST_F(TaskStatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck)
update.slave_id(),
frameworkId,
update.status().task_id(),
- UUID::random().toBytes());
+ id::UUID::random().toBytes());
AWAIT_READY(unexpectedAck);
[4/6] mesos git commit: Mesos: Used a namespace for UUID.
Posted by bb...@apache.org.
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);
[3/6] mesos git commit: Mesos: Used a namespace for UUID.
Posted by bb...@apache.org.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
index efc57ad..22bd995 100644
--- a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp
@@ -111,7 +111,7 @@ protected:
SlaveState slaveState;
slaveState.id = slaveId;
FrameworkID frameworkId;
- frameworkId.set_value(UUID::random().toString());
+ frameworkId.set_value(id::UUID::random().toString());
slaveState.frameworks.put(frameworkId, frameworkState);
// NOTE: The executor directory must exist for executor containers
@@ -138,10 +138,10 @@ protected:
TEST_F(NestedMesosContainerizerTest, NestedContainerID)
{
ContainerID id1;
- id1.set_value(UUID::random().toString());
+ id1.set_value(id::UUID::random().toString());
ContainerID id2;
- id2.set_value(UUID::random().toString());
+ id2.set_value(id::UUID::random().toString());
EXPECT_EQ(id1, id1);
EXPECT_NE(id1, id2);
@@ -193,7 +193,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_LaunchNested)
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);
@@ -212,7 +212,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_LaunchNested)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -267,7 +267,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
const string envKey = "MESOS_NESTED_INHERITS_ENVIRONMENT";
const int32_t envValue = 42;
@@ -305,7 +305,7 @@ TEST_F(NestedMesosContainerizerTest,
{
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launchNested = containerizer->launch(
nestedContainerId,
@@ -339,7 +339,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launchNested = containerizer->launch(
nestedContainerId,
@@ -390,7 +390,7 @@ TEST_F(NestedMesosContainerizerTest,
{
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launchNested = containerizer->launch(
nestedContainerId,
@@ -450,7 +450,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a pipe to pass parent's MESOS_SANDBOX value to a child container.
Try<std::array<int_fd, 2>> pipes_ = os::pipe();
@@ -496,7 +496,7 @@ TEST_F(NestedMesosContainerizerTest,
{
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
// NOTE: We use a non-shell command here to use 'bash -c' to execute
// the 'read', which deals with the file descriptor, because of a bug
@@ -571,7 +571,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a pipe to synchronize with the top-level container.
Try<std::array<int_fd, 2>> pipes_ = os::pipe();
@@ -631,7 +631,7 @@ TEST_F(NestedMesosContainerizerTest,
{
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launchNested = containerizer->launch(
nestedContainerId,
@@ -681,7 +681,7 @@ TEST_F(NestedMesosContainerizerTest,
{
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Future<Containerizer::LaunchResult> launchNested = containerizer->launch(
nestedContainerId,
@@ -739,7 +739,7 @@ TEST_F(NestedMesosContainerizerTest,
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);
@@ -758,7 +758,7 @@ TEST_F(NestedMesosContainerizerTest,
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
// Launch the nested container with the `ps | wc -l` command and
// launch the container without a `ContainerClass`. With this
@@ -858,7 +858,7 @@ TEST_F(NestedMesosContainerizerTest,
// Launch the parent container.
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
Try<string> directory = environment->mkdtemp();
ASSERT_SOME(directory);
@@ -881,7 +881,7 @@ TEST_F(NestedMesosContainerizerTest,
// with the parent container.
ContainerID nestedContainerId1;
nestedContainerId1.mutable_parent()->CopyFrom(containerId);
- nestedContainerId1.set_value(UUID::random().toString());
+ nestedContainerId1.set_value(id::UUID::random().toString());
ContainerInfo container;
container.set_type(ContainerInfo::MESOS);
@@ -908,7 +908,7 @@ TEST_F(NestedMesosContainerizerTest,
// Launch the second nested container which will have its own pid namespace.
ContainerID nestedContainerId2;
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
- nestedContainerId2.set_value(UUID::random().toString());
+ nestedContainerId2.set_value(id::UUID::random().toString());
container.mutable_linux_info()->set_share_pid_namespace(false);
@@ -1063,7 +1063,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(
statusRunning->container_status().container_id());
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
// Launch a debug container inside the command task and check for
// the existence of a file we know to be inside the `alpine` docker
@@ -1120,7 +1120,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -1152,7 +1152,7 @@ TEST_F(NestedMesosContainerizerTest,
// Now launch a debug container which should be destroyed on recovery.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1238,7 +1238,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyNested)
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);
@@ -1257,7 +1257,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyNested)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1315,7 +1315,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyParent)
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);
@@ -1334,7 +1334,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyParent)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1390,7 +1390,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentExit)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
Try<std::array<int_fd, 2>> pipes_ = os::pipe();
ASSERT_SOME(pipes_);
@@ -1426,7 +1426,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentExit)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1484,7 +1484,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentSigterm)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a pipe to synchronize with the top-level container.
Try<std::array<int_fd, 2>> pipes_ = os::pipe();
@@ -1522,7 +1522,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentSigterm)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1589,7 +1589,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNested)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -1621,7 +1621,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNested)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1729,7 +1729,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedWithoutConfig)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -1761,7 +1761,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedWithoutConfig)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -1883,7 +1883,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverLauncherOrphans)
ASSERT_SOME(freezerHierarchy);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
const string cgroup = path::join(
flags.cgroups_root,
@@ -1929,7 +1929,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedLauncherOrphans)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -1970,7 +1970,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedLauncherOrphans)
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
const string cgroup = path::join(
flags.cgroups_root,
@@ -2057,7 +2057,7 @@ TEST_F(NestedMesosContainerizerTest,
ASSERT_SOME(freezerHierarchy);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
string cgroup = path::join(
flags.cgroups_root,
@@ -2067,7 +2067,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
cgroup = path::join(
flags.cgroups_root,
@@ -2124,7 +2124,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -2165,7 +2165,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId1;
nestedContainerId1.mutable_parent()->CopyFrom(containerId);
- nestedContainerId1.set_value(UUID::random().toString());
+ nestedContainerId1.set_value(id::UUID::random().toString());
string cgroup = path::join(
flags.cgroups_root,
@@ -2175,7 +2175,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId2;
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
- nestedContainerId2.set_value(UUID::random().toString());
+ nestedContainerId2.set_value(id::UUID::random().toString());
cgroup = path::join(
flags.cgroups_root,
@@ -2264,7 +2264,7 @@ TEST_F(NestedMesosContainerizerTest,
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"executor",
@@ -2296,7 +2296,7 @@ TEST_F(NestedMesosContainerizerTest,
// Now launch the first nested container.
ContainerID nestedContainerId1;
nestedContainerId1.mutable_parent()->CopyFrom(containerId);
- nestedContainerId1.set_value(UUID::random().toString());
+ nestedContainerId1.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId1,
@@ -2324,7 +2324,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId2;
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
- nestedContainerId2.set_value(UUID::random().toString());
+ nestedContainerId2.set_value(id::UUID::random().toString());
const string cgroup = path::join(
flags.cgroups_root,
@@ -2429,7 +2429,7 @@ TEST_F(NestedMesosContainerizerTest,
ASSERT_SOME(freezerHierarchy);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
string cgroup = path::join(
flags.cgroups_root,
@@ -2439,7 +2439,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId1;
nestedContainerId1.mutable_parent()->CopyFrom(containerId);
- nestedContainerId1.set_value(UUID::random().toString());
+ nestedContainerId1.set_value(id::UUID::random().toString());
cgroup = path::join(
flags.cgroups_root,
@@ -2449,7 +2449,7 @@ TEST_F(NestedMesosContainerizerTest,
ContainerID nestedContainerId2;
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
- nestedContainerId2.set_value(UUID::random().toString());
+ nestedContainerId2.set_value(id::UUID::random().toString());
cgroup = path::join(
flags.cgroups_root,
@@ -2512,7 +2512,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_AgentEnvironmentNotLeaked)
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);
@@ -2531,7 +2531,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_AgentEnvironmentNotLeaked)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
// Construct a command that verifies that agent environment
// variables are not leaked to the nested container.
@@ -2600,7 +2600,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_Remove)
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);
@@ -2619,7 +2619,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_Remove)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -2694,7 +2694,7 @@ TEST_F(NestedMesosContainerizerTest,
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);
@@ -2713,7 +2713,7 @@ TEST_F(NestedMesosContainerizerTest,
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 38db7e5..575ba46 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -466,7 +466,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
Resources::parse(container1Ports).get());
ContainerID containerId1;
- containerId1.set_value(UUID::random().toString());
+ containerId1.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -532,7 +532,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP)
ASSERT_TRUE(waitForFileCreation(container1Ready));
ContainerID containerId2;
- containerId2.set_value(UUID::random().toString());
+ containerId2.set_value(id::UUID::random().toString());
executorInfo.mutable_resources()->CopyFrom(
Resources::parse(container2Ports).get());
@@ -629,7 +629,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
Resources::parse(container1Ports).get());
ContainerID containerId1;
- containerId1.set_value(UUID::random().toString());
+ containerId1.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -695,7 +695,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP)
ASSERT_TRUE(waitForFileCreation(container1Ready));
ContainerID containerId2;
- containerId2.set_value(UUID::random().toString());
+ containerId2.set_value(id::UUID::random().toString());
executorInfo.mutable_resources()->CopyFrom(
Resources::parse(container2Ports).get());
@@ -794,7 +794,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerUDP)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -912,7 +912,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerTCP)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1038,7 +1038,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternal)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1125,7 +1125,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternal)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1215,7 +1215,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternal)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1311,7 +1311,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNS)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1403,7 +1403,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers)
Resources::parse(container1Ports).get());
ContainerID containerId1;
- containerId1.set_value(UUID::random().toString());
+ containerId1.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1453,7 +1453,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers)
::close(pipes[1]);
ContainerID containerId2;
- containerId2.set_value(UUID::random().toString());
+ containerId2.set_value(id::UUID::random().toString());
executorInfo.mutable_resources()->CopyFrom(
Resources::parse(container2Ports).get());
@@ -1522,7 +1522,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
@@ -1686,7 +1686,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics)
Resources::parse(container1Ports).get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
// Use a relative temporary directory so it gets cleaned up
// automatically with the test.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index ca9c61e..5edd89b 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -375,8 +375,8 @@ TEST_F(ProvisionerAppcTest, ROOT_ProvisionNestedContainer)
ContainerID parent;
ContainerID child;
- parent.set_value(UUID::random().toString());
- child.set_value(UUID::random().toString());
+ parent.set_value(id::UUID::random().toString());
+ child.set_value(id::UUID::random().toString());
child.mutable_parent()->CopyFrom(parent);
Future<slave::ProvisionInfo> provisionInfo =
@@ -443,7 +443,7 @@ TEST_F(ProvisionerAppcTest, Recover)
image.mutable_appc()->CopyFrom(getTestImage());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
Future<slave::ProvisionInfo> provisionInfo =
provisioner.get()->provision(containerId, image);
@@ -516,8 +516,8 @@ TEST_F(ProvisionerAppcTest, RecoverNestedContainer)
ContainerID parent;
ContainerID child;
- parent.set_value(UUID::random().toString());
- child.set_value(UUID::random().toString());
+ parent.set_value(id::UUID::random().toString());
+ child.set_value(id::UUID::random().toString());
child.mutable_parent()->CopyFrom(parent);
AWAIT_READY(provisioner.get()->provision(parent, image));
@@ -585,8 +585,8 @@ TEST_F(ProvisionerAppcTest, RecoverNestedContainerNoParentImage)
ContainerID parent;
ContainerID child;
- parent.set_value(UUID::random().toString());
- child.set_value(UUID::random().toString());
+ parent.set_value(id::UUID::random().toString());
+ child.set_value(id::UUID::random().toString());
child.mutable_parent()->CopyFrom(parent);
AWAIT_READY(provisioner.get()->provision(child, image));
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index 9842743..c664ff8 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -1066,11 +1066,11 @@ TEST_F(ProvisionerDockerTest, ROOT_RecoverNestedOnReboot)
ASSERT_SOME(provisioner);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
Image image;
image.set_type(Image::DOCKER);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/runtime_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/runtime_isolator_tests.cpp b/src/tests/containerizer/runtime_isolator_tests.cpp
index 09ced98..b703b82 100644
--- a/src/tests/containerizer/runtime_isolator_tests.cpp
+++ b/src/tests/containerizer/runtime_isolator_tests.cpp
@@ -133,7 +133,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultCmdLocalPuller)
TaskInfo task;
task.set_name("test-task");
- task.mutable_task_id()->set_value(UUID::random().toString());
+ task.mutable_task_id()->set_value(id::UUID::random().toString());
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get());
task.mutable_command()->set_shell(false);
@@ -223,7 +223,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultEntryptLocalPuller)
TaskInfo task;
task.set_name("test-task");
- task.mutable_task_id()->set_value(UUID::random().toString());
+ task.mutable_task_id()->set_value(id::UUID::random().toString());
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get());
task.mutable_command()->set_shell(false);
@@ -303,7 +303,7 @@ TEST_F(DockerRuntimeIsolatorTest,
TaskInfo task;
task.set_name("test-task");
- task.mutable_task_id()->set_value(UUID::random().toString());
+ task.mutable_task_id()->set_value(id::UUID::random().toString());
task.mutable_slave_id()->CopyFrom(offer.slave_id());
task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get());
task.mutable_command()->set_shell(false);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_host_path_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_host_path_isolator_tests.cpp b/src/tests/containerizer/volume_host_path_isolator_tests.cpp
index 271bbbe..e4d0734 100644
--- a/src/tests/containerizer/volume_host_path_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_host_path_isolator_tests.cpp
@@ -83,7 +83,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_VolumeFromHost)
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",
@@ -140,7 +140,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_FileVolumeFromHost)
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",
@@ -198,7 +198,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_VolumeFromHostSandboxMountPoint)
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",
@@ -255,7 +255,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_FileVolumeFromHostSandboxMountPoint)
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",
@@ -304,7 +304,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_MountPropagation)
Owned<Containerizer> containerizer(create.get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
string mountDirectory = path::join(flags.work_dir, "mount_directory");
string mountPoint = path::join(mountDirectory, "mount_point");
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_image_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_image_isolator_tests.cpp b/src/tests/containerizer/volume_image_isolator_tests.cpp
index da36422..3aa19e2 100644
--- a/src/tests/containerizer/volume_image_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_image_isolator_tests.cpp
@@ -94,7 +94,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem)
Owned<Containerizer> containerizer(create.get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ContainerInfo container = createContainerInfo(
None(),
@@ -126,7 +126,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem)
if (nesting) {
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
@@ -182,7 +182,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem)
Owned<Containerizer> containerizer(create.get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ContainerInfo container = createContainerInfo(
"test_image_rootfs",
@@ -216,7 +216,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem)
if (nesting) {
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
index 5b75852..0400052 100644
--- a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
@@ -78,7 +78,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfType)
Owned<MesosContainerizer> containerizer(create.get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"test_executor",
@@ -137,7 +137,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo("executor", "sleep 99", "cpus:1");
@@ -154,7 +154,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume)
ContainerID nestedContainerId1;
nestedContainerId1.mutable_parent()->CopyFrom(containerId);
- nestedContainerId1.set_value(UUID::random().toString());
+ nestedContainerId1.set_value(id::UUID::random().toString());
ContainerInfo containerInfo;
containerInfo.set_type(ContainerInfo::MESOS);
@@ -182,7 +182,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume)
ContainerID nestedContainerId2;
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
- nestedContainerId2.set_value(UUID::random().toString());
+ nestedContainerId2.set_value(id::UUID::random().toString());
launch = containerizer->launch(
nestedContainerId2,
@@ -240,7 +240,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfTypeOwnership)
Owned<MesosContainerizer> containerizer(create.get());
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo(
"test_executor",
@@ -303,7 +303,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_ParentTypeOwnership)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ExecutorInfo executor = createExecutorInfo("executor", "sleep 99", "cpus:1");
@@ -324,7 +324,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_ParentTypeOwnership)
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
ContainerInfo containerInfo;
containerInfo.set_type(ContainerInfo::MESOS);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_secret_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_secret_isolator_tests.cpp b/src/tests/containerizer/volume_secret_isolator_tests.cpp
index 4d03a02..56691ae 100644
--- a/src/tests/containerizer/volume_secret_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_secret_isolator_tests.cpp
@@ -181,7 +181,7 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem)
AWAIT_READY(containerizer->recover(state));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
ContainerInfo containerInfo;
if (fsType == WITH_ROOTFS) {
@@ -221,7 +221,7 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem)
// Now launch nested container.
ContainerID nestedContainerId;
nestedContainerId.mutable_parent()->CopyFrom(containerId);
- nestedContainerId.set_value(UUID::random().toString());
+ nestedContainerId.set_value(id::UUID::random().toString());
CommandInfo nestedCommand = createCommandInfo(
"secret=$(cat " + secretContainerPath + "); "
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 6f69b6f..2dfd009 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1325,7 +1325,7 @@ TEST_F(FaultToleranceTest, ForwardStatusUpdateUnknownExecutor)
taskId,
TASK_RUNNING,
TaskStatus::SOURCE_SLAVE,
- UUID::random(),
+ id::UUID::random(),
"Dummy update");
process::dispatch(
@@ -1988,7 +1988,7 @@ TEST_F(FaultToleranceTest, SplitBrainMasters)
runningStatus->task_id(),
TASK_LOST,
TaskStatus::SOURCE_SLAVE,
- UUID::random()));
+ id::UUID::random()));
// Spoof a message from a random master; this should be dropped by
// the scheduler driver. Since this is delivered locally, it is
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/fetcher_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp
index 967d256..bce59d4 100644
--- a/src/tests/fetcher_tests.cpp
+++ b/src/tests/fetcher_tests.cpp
@@ -111,7 +111,7 @@ TEST_F(FetcherTest, FileURI)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -149,7 +149,7 @@ TEST_F(FetcherTest, ROOT_RootProtectedFileURI)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
commandInfo.set_user(user);
@@ -181,7 +181,7 @@ TEST_F(FetcherTest, CustomOutputFileSubdirectory)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -218,7 +218,7 @@ TEST_F(FetcherTest, AbsoluteCustomSubdirectoryFails)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -258,10 +258,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, InvalidUser)
flags.frameworks_home = "/tmp/frameworks";
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
- commandInfo.set_user(UUID::random().toString());
+ commandInfo.set_user(id::UUID::random().toString());
CommandInfo::URI* uri = commandInfo.add_uris();
uri->set_value(uri::from_path(testFile));
@@ -295,7 +295,7 @@ TEST_F(FetcherTest, NonExistingFile)
flags.frameworks_home = "/tmp/frameworks";
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -322,7 +322,7 @@ TEST_F(FetcherTest, MalformedURI)
flags.frameworks_home = "/tmp/frameworks";
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -355,7 +355,7 @@ TEST_F(FetcherTest, AbsoluteFilePath)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -387,7 +387,7 @@ TEST_F(FetcherTest, RelativeFilePath)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -480,7 +480,7 @@ TEST_F(FetcherTest, OSNetUriTest)
flags.frameworks_home = "/tmp/frameworks";
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -526,7 +526,7 @@ TEST_F(FetcherTest, OSNetUriSpaceTest)
flags.frameworks_home = "/tmp/frameworks";
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -565,7 +565,7 @@ TEST_F(FetcherTest, FileLocalhostURI)
flags.launcher_dir = getLauncherDir();
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -595,7 +595,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractNotExecutable)
ASSERT_SOME(path);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -637,7 +637,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractExecutable)
ASSERT_SOME(path);
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -692,7 +692,7 @@ TEST_F(FetcherTest, ExtractNotExecutable)
"tar cf '" + path.get() + ".tar.gz' '" + path.get() + "' 2>&1"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -753,7 +753,7 @@ TEST_F(FetcherTest, ExtractTar)
"tar cf '" + path.get() + ".tar' '" + path.get() + "' 2>&1"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -799,7 +799,7 @@ TEST_F(FetcherTest, ExtractGzipFile)
ASSERT_SOME(os::shell("gzip " + path.get()));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -849,7 +849,7 @@ TEST_F(FetcherTest, Unzip_ExtractFile)
ASSERT_SOME(os::rename(path.get(), path.get() + ".zip"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -902,7 +902,7 @@ TEST_F(FetcherTest, Unzip_ExtractInvalidFile)
ASSERT_SOME(os::rename(path.get(), path.get() + ".zip"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -976,7 +976,7 @@ TEST_F(FetcherTest, Unzip_ExtractFileWithDuplicatedEntries)
ASSERT_SOME(os::rename(path.get(), path.get() + ".zip"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -1017,7 +1017,7 @@ TEST_F(FetcherTest, UseCustomOutputFile)
ASSERT_SOME(os::write(path.get(), "hello renamed file"));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
const string customOutputFile = "custom.txt";
CommandInfo commandInfo;
@@ -1060,7 +1060,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, CustomGzipOutputFile)
ASSERT_SOME(os::shell("gzip " + path.get()));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
const string customOutputFile = "custom";
CommandInfo commandInfo;
@@ -1159,7 +1159,7 @@ TEST_F(FetcherTest, HdfsURI)
flags.hadoop_home = hadoopPath;
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
@@ -1213,7 +1213,7 @@ TEST_F(FetcherTest, SSLEnvironmentSpillover)
ASSERT_SOME(os::shell("gzip " + path.get()));
ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
CommandInfo commandInfo;
CommandInfo::URI* uri = commandInfo.add_uris();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index a488403..e41bd94 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -6997,7 +6997,7 @@ TEST_F(MasterTest, DISABLED_RecoverResourcesOrphanedTask)
status.mutable_executor_id()->CopyFrom(evolve(executorId));
status.set_state(v1::TASK_FINISHED);
status.set_source(v1::TaskStatus::SOURCE_EXECUTOR);
- status.set_uuid(UUID::random().toBytes());
+ status.set_uuid(id::UUID::random().toBytes());
v1::executor::Call call;
call.mutable_framework_id()->CopyFrom(frameworkId);
@@ -8474,12 +8474,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(MasterTest, RegistryGcByCount)
AWAIT_READY(registered);
TaskStatus status1;
- status1.mutable_task_id()->set_value(UUID::random().toString());
+ status1.mutable_task_id()->set_value(id::UUID::random().toString());
status1.mutable_slave_id()->CopyFrom(slaveId);
status1.set_state(TASK_STAGING); // Dummy value.
TaskStatus status2;
- status2.mutable_task_id()->set_value(UUID::random().toString());
+ status2.mutable_task_id()->set_value(id::UUID::random().toString());
status2.mutable_slave_id()->CopyFrom(slaveId2);
status2.set_state(TASK_STAGING); // Dummy value.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 48c69a5..d6216cc 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -1411,7 +1411,7 @@ TEST_F(TaskValidationTest, ExecutorUsesInvalidFrameworkID)
// Create an executor with a random framework id.
ExecutorInfo executor;
executor = DEFAULT_EXECUTOR_INFO;
- executor.mutable_framework_id()->set_value(UUID::random().toString());
+ executor.mutable_framework_id()->set_value(id::UUID::random().toString());
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(LaunchTasks(executor, 1, 1, 16, "*"))
@@ -2560,7 +2560,7 @@ TEST_F(ExecutorValidationTest, ExecutorType)
{
ExecutorInfo executorInfo;
executorInfo = DEFAULT_EXECUTOR_INFO;
- executorInfo.mutable_framework_id()->set_value(UUID::random().toString());
+ executorInfo.mutable_framework_id()->set_value(id::UUID::random().toString());
{
// 'CUSTOM' executor with `CommandInfo` set is valid.
@@ -4147,11 +4147,11 @@ TEST_F(RegisterSlaveValidationTest, DropInvalidReregistration)
ReregisterSlaveMessage message = reregisterSlaveMessage.get();
Task* task = message.add_tasks();
- task->set_name(UUID::random().toString());
- task->mutable_slave_id()->set_value(UUID::random().toString());
- task->mutable_task_id()->set_value(UUID::random().toString());
- task->mutable_framework_id()->set_value(UUID::random().toString());
- task->mutable_executor_id()->set_value(UUID::random().toString());
+ task->set_name(id::UUID::random().toString());
+ task->mutable_slave_id()->set_value(id::UUID::random().toString());
+ task->mutable_task_id()->set_value(id::UUID::random().toString());
+ task->mutable_framework_id()->set_value(id::UUID::random().toString());
+ task->mutable_executor_id()->set_value(id::UUID::random().toString());
task->set_state(TASK_RUNNING);
// We expect the master to drop the ReregisterSlaveMessage, so it
@@ -4199,9 +4199,9 @@ TEST_F(RegisterSlaveValidationTest, DropInvalidRegistration)
slaveInfo->mutable_id()->set_value(
strings::join(
"/../",
- UUID::random().toString(),
- UUID::random().toString(),
- UUID::random().toString()));
+ id::UUID::random().toString(),
+ id::UUID::random().toString(),
+ id::UUID::random().toString()));
// Send the modified message to the master.
process::post(slave.get()->pid, master->get()->pid, message);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp
index 7ed08a5..1031283 100644
--- a/src/tests/mesos.cpp
+++ b/src/tests/mesos.cpp
@@ -683,7 +683,8 @@ slave::Flags ContainerizerTest<slave::MesosContainerizer>::CreateSlaveFlags()
if (cgroups::enabled() && user.get() == "root") {
flags.isolation = "cgroups/cpu,cgroups/mem";
flags.cgroups_hierarchy = baseHierarchy;
- flags.cgroups_root = TEST_CGROUPS_ROOT + "_" + UUID::random().toString();
+ flags.cgroups_root =
+ TEST_CGROUPS_ROOT + "_" + id::UUID::random().toString();
} else {
flags.isolation = "posix/cpu,posix/mem";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 320e975..821cce3 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -803,7 +803,7 @@ inline TTaskInfo createTask(
const TCommandInfo& command,
const Option<TExecutorID>& executorId = None(),
const std::string& name = "test-task",
- const std::string& id = UUID::random().toString())
+ const std::string& id = id::UUID::random().toString())
{
TTaskInfo task;
task.set_name(name);
@@ -837,7 +837,7 @@ inline TTaskInfo createTask(
const std::string& command,
const Option<TExecutorID>& executorId = None(),
const std::string& name = "test-task",
- const std::string& id = UUID::random().toString())
+ const std::string& id = id::UUID::random().toString())
{
return createTask<
TTaskInfo,
@@ -869,7 +869,7 @@ inline TTaskInfo createTask(
const std::string& command,
const Option<TExecutorID>& executorId = None(),
const std::string& name = "test-task",
- const std::string& id = UUID::random().toString())
+ const std::string& id = id::UUID::random().toString())
{
return createTask<
TTaskInfo,
@@ -2737,7 +2737,7 @@ ACTION_P3(SendUpdateFromTask, frameworkId, executorId, state)
status.mutable_executor_id()->CopyFrom(executorId);
status.set_state(state);
status.set_source(mesos::v1::TaskStatus::SOURCE_EXECUTOR);
- status.set_uuid(UUID::random().toBytes());
+ status.set_uuid(id::UUID::random().toBytes());
mesos::v1::executor::Call call;
call.mutable_framework_id()->CopyFrom(frameworkId);
@@ -2758,7 +2758,7 @@ ACTION_P3(SendUpdateFromTaskID, frameworkId, executorId, state)
status.mutable_executor_id()->CopyFrom(executorId);
status.set_state(state);
status.set_source(mesos::v1::TaskStatus::SOURCE_EXECUTOR);
- status.set_uuid(UUID::random().toBytes());
+ status.set_uuid(id::UUID::random().toBytes());
mesos::v1::executor::Call call;
call.mutable_framework_id()->CopyFrom(frameworkId);
@@ -2996,7 +2996,7 @@ public:
typename Call::UpdateState* update = call.mutable_update_state();
update->mutable_resources()->CopyFrom(injected);
- update->set_resource_version_uuid(UUID::random().toBytes());
+ update->set_resource_version_uuid(id::UUID::random().toBytes());
driver->send(call);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/offer_operation_status_update_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/offer_operation_status_update_manager_tests.cpp b/src/tests/offer_operation_status_update_manager_tests.cpp
index e56fb0e..4c92e86 100644
--- a/src/tests/offer_operation_status_update_manager_tests.cpp
+++ b/src/tests/offer_operation_status_update_manager_tests.cpp
@@ -88,8 +88,8 @@ protected:
}
OfferOperationStatusUpdate createOfferOperationStatusUpdate(
- const UUID& statusUuid,
- const UUID& operationUuid,
+ const id::UUID& statusUuid,
+ const id::UUID& operationUuid,
const OfferOperationState& state,
const Option<FrameworkID>& frameworkId = None())
{
@@ -121,7 +121,7 @@ protected:
forward, OfferOperationStatusUpdateManagerTest::getPath);
}
- static const string getPath(const UUID& operationUuid)
+ static const string getPath(const id::UUID& operationUuid)
{
return path::join(os::getcwd(), "streams", operationUuid.toString());
}
@@ -139,8 +139,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateAndAck)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_FINISHED);
@@ -174,8 +174,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateAndAckNonTerminalUpdate)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING);
@@ -211,8 +211,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, ResendUnacknowledged)
.WillOnce(FutureArg<0>(&forwardedStatusUpdate1))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate2));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_FINISHED);
@@ -256,8 +256,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, Cleanup)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
FrameworkID frameworkId;
frameworkId.set_value("frameworkId");
@@ -298,8 +298,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverCheckpointedStream)
.WillOnce(FutureArg<0>(&forwardedStatusUpdate1))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate2));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -356,8 +356,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverNotCheckpointedStream)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -395,8 +395,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverEmptyFile)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -452,8 +452,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverEmptyDirectory)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -503,8 +503,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverTerminatedStream)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -561,8 +561,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, IgnoreDuplicateUpdate)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -601,8 +601,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, IgnoreDuplicateUpdateAfterRecover)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -646,8 +646,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RejectDuplicateAck)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -687,8 +687,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RejectDuplicateAckAfterRecover)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -735,8 +735,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, NonStrictRecoveryCorruptedFile)
.WillOnce(FutureArg<0>(&forwardedStatusUpdate1))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate2));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -801,8 +801,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, StrictRecoveryCorruptedFile)
EXPECT_CALL(statusUpdateProcessor, update(_))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate));
- const UUID operationUuid = UUID::random();
- const UUID statusUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
+ const id::UUID statusUuid = id::UUID::random();
OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate(
statusUuid,
@@ -851,9 +851,9 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateLatestWhenResending)
.WillOnce(FutureArg<0>(&forwardedStatusUpdate2))
.WillOnce(FutureArg<0>(&forwardedStatusUpdate3));
- const UUID operationUuid = UUID::random();
+ const id::UUID operationUuid = id::UUID::random();
- const UUID statusUuid1 = UUID::random();
+ const id::UUID statusUuid1 = id::UUID::random();
OfferOperationStatusUpdate statusUpdate1 = createOfferOperationStatusUpdate(
statusUuid1, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING);
@@ -872,7 +872,7 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateLatestWhenResending)
EXPECT_FALSE(forwardedStatusUpdate2.isReady());
// Send another status update.
- const UUID statusUuid2 = UUID::random();
+ const id::UUID statusUuid2 = id::UUID::random();
OfferOperationStatusUpdate statusUpdate2 = createOfferOperationStatusUpdate(
statusUuid2, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING);
AWAIT_ASSERT_READY(statusUpdateManager->update(statusUpdate2, true));
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index a5a1468..9fcc0a8 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -1731,7 +1731,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates)
taskId1,
TASK_RUNNING,
TaskStatus::SOURCE_SLAVE,
- UUID::random());
+ id::UUID::random());
StatusUpdateMessage message1;
message1.mutable_update()->CopyFrom(update1);
@@ -1771,7 +1771,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates)
taskId2,
TASK_RUNNING,
TaskStatus::SOURCE_SLAVE,
- UUID::random());
+ id::UUID::random());
StatusUpdateMessage message2;
message2.mutable_update()->CopyFrom(update2);
@@ -2553,7 +2553,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
// the unreachable list; hence `unreachable_time` should be set on
// the result of the reconciliation request.
TaskStatus status1;
- status1.mutable_task_id()->set_value(UUID::random().toString());
+ status1.mutable_task_id()->set_value(id::UUID::random().toString());
status1.mutable_slave_id()->CopyFrom(slaveId1);
status1.set_state(TASK_STAGING); // Dummy value.
@@ -2576,7 +2576,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
// Because the agent has been removed from the unreachable list in
// the registry, `unreachable_time` should NOT be set.
TaskStatus status2;
- status2.mutable_task_id()->set_value(UUID::random().toString());
+ status2.mutable_task_id()->set_value(id::UUID::random().toString());
status2.mutable_slave_id()->CopyFrom(slaveId1);
status2.set_state(TASK_STAGING); // Dummy value.
@@ -2595,7 +2595,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount)
// partitioned slave. Because the agent is still in the unreachable
// list in the registry, `unreachable_time` should be set.
TaskStatus status3;
- status3.mutable_task_id()->set_value(UUID::random().toString());
+ status3.mutable_task_id()->set_value(id::UUID::random().toString());
status3.mutable_slave_id()->CopyFrom(slaveId2);
status3.set_state(TASK_STAGING); // Dummy value.
@@ -2648,7 +2648,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves)
vector<SlaveID> slaveIDs;
for (int i = 0; i < 50; i++) {
SlaveID slaveID;
- slaveID.set_value(UUID::random().toString());
+ slaveID.set_value(id::UUID::random().toString());
slaveIDs.push_back(slaveID);
SlaveInfo slaveInfo;
@@ -2704,7 +2704,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves)
SlaveID removedSlaveID = *(slaveIDs.crbegin() + 1);
TaskStatus status1;
- status1.mutable_task_id()->set_value(UUID::random().toString());
+ status1.mutable_task_id()->set_value(id::UUID::random().toString());
status1.mutable_slave_id()->CopyFrom(keptSlaveID);
status1.set_state(TASK_STAGING); // Dummy value.
@@ -2720,7 +2720,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves)
EXPECT_EQ(unreachableTime, reconcileUpdate1->unreachable_time());
TaskStatus status2;
- status2.mutable_task_id()->set_value(UUID::random().toString());
+ status2.mutable_task_id()->set_value(id::UUID::random().toString());
status2.mutable_slave_id()->CopyFrom(removedSlaveID);
status2.set_state(TASK_STAGING); // Dummy value.
@@ -2917,7 +2917,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
// Since neither slave has exceeded the age-based GC bound, we
// expect to find both slaves (i.e., `unreachable_time` will be set).
TaskStatus status1;
- status1.mutable_task_id()->set_value(UUID::random().toString());
+ status1.mutable_task_id()->set_value(id::UUID::random().toString());
status1.mutable_slave_id()->CopyFrom(slaveId1);
status1.set_state(TASK_STAGING); // Dummy value.
@@ -2933,7 +2933,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
EXPECT_EQ(partitionTime1, reconcileUpdate1->unreachable_time());
TaskStatus status2;
- status2.mutable_task_id()->set_value(UUID::random().toString());
+ status2.mutable_task_id()->set_value(id::UUID::random().toString());
status2.mutable_slave_id()->CopyFrom(slaveId2);
status2.set_state(TASK_STAGING); // Dummy value.
@@ -2956,7 +2956,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
// We expect `slave1` to have been garbage collected, but `slave2`
// should still be present in the registry.
TaskStatus status3;
- status3.mutable_task_id()->set_value(UUID::random().toString());
+ status3.mutable_task_id()->set_value(id::UUID::random().toString());
status3.mutable_slave_id()->CopyFrom(slaveId1);
status3.set_state(TASK_STAGING); // Dummy value.
@@ -2972,7 +2972,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
EXPECT_FALSE(reconcileUpdate3->has_unreachable_time());
TaskStatus status4;
- status4.mutable_task_id()->set_value(UUID::random().toString());
+ status4.mutable_task_id()->set_value(id::UUID::random().toString());
status4.mutable_slave_id()->CopyFrom(slaveId2);
status4.set_state(TASK_STAGING); // Dummy value.
@@ -2995,7 +2995,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge)
// expect that it has been garbage collected, which means
// `unreachable_time` will not be set.
TaskStatus status5;
- status5.mutable_task_id()->set_value(UUID::random().toString());
+ status5.mutable_task_id()->set_value(id::UUID::random().toString());
status5.mutable_slave_id()->CopyFrom(slaveId2);
status5.set_state(TASK_STAGING); // Dummy value.
@@ -3249,7 +3249,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
// unreachable list. We use reconciliation to verify this.
TaskStatus status1;
- status1.mutable_task_id()->set_value(UUID::random().toString());
+ status1.mutable_task_id()->set_value(id::UUID::random().toString());
status1.mutable_slave_id()->CopyFrom(slaveId1);
status1.set_state(TASK_STAGING); // Dummy value.
@@ -3265,7 +3265,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
EXPECT_FALSE(reconcileUpdate1->has_unreachable_time());
TaskStatus status2;
- status2.mutable_task_id()->set_value(UUID::random().toString());
+ status2.mutable_task_id()->set_value(id::UUID::random().toString());
status2.mutable_slave_id()->CopyFrom(slaveId2);
status2.set_state(TASK_STAGING); // Dummy value.
@@ -3281,7 +3281,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace)
EXPECT_FALSE(reconcileUpdate2->has_unreachable_time());
TaskStatus status3;
- status3.mutable_task_id()->set_value(UUID::random().toString());
+ status3.mutable_task_id()->set_value(id::UUID::random().toString());
status3.mutable_slave_id()->CopyFrom(slaveId3);
status3.set_state(TASK_STAGING); // Dummy value.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/paths_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/paths_tests.cpp b/src/tests/paths_tests.cpp
index 07e0cac..dc765ed 100644
--- a/src/tests/paths_tests.cpp
+++ b/src/tests/paths_tests.cpp
@@ -47,7 +47,7 @@ public:
frameworkId.set_value("framework1");
executorId.set_value("executor1");
taskId.set_value("task1");
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
role = "role1";
persistenceId = "persistenceId1";
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp
index f88b115..9ee91c9 100644
--- a/src/tests/reconciliation_tests.cpp
+++ b/src/tests/reconciliation_tests.cpp
@@ -258,8 +258,8 @@ TEST_F(ReconciliationTest, UnknownSlave)
// Create a task status with a random slave id and task id.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
- status.mutable_slave_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
+ status.mutable_slave_id()->set_value(id::UUID::random().toString());
status.set_state(TASK_STAGING); // Dummy value.
driver.reconcileTasks({status});
@@ -316,7 +316,7 @@ TEST_F(ReconciliationTest, UnknownTask)
// Create a task status with a random task id.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.mutable_slave_id()->CopyFrom(slaveId);
status.set_state(TASK_STAGING); // Dummy value.
@@ -378,7 +378,7 @@ TEST_F(ReconciliationTest, UnknownTaskPartitionAware)
// Create a task status with a random task id.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.mutable_slave_id()->CopyFrom(slaveId);
status.set_state(TASK_STAGING); // Dummy value.
@@ -422,7 +422,7 @@ TEST_F(ReconciliationTest, UnknownKillTask)
// Create a task status with a random task id.
TaskID taskId;
- taskId.set_value(UUID::random().toString());
+ taskId.set_value(id::UUID::random().toString());
driver.killTask(taskId);
@@ -500,7 +500,7 @@ TEST_F(ReconciliationTest, RecoveredAgent)
// Reconcile for a random task ID on the slave.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.mutable_slave_id()->CopyFrom(slaveId);
status.set_state(TASK_STAGING); // Dummy value.
@@ -600,7 +600,7 @@ TEST_F(ReconciliationTest, RecoveredAgentReregistrationInProgress)
// Reconcile for a random task ID on the slave.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.mutable_slave_id()->CopyFrom(slaveId);
status.set_state(TASK_STAGING); // Dummy value.
@@ -690,7 +690,7 @@ TEST_F(ReconciliationTest, RemovalInProgress)
// Reconcile for a random task ID on the slave.
TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.mutable_slave_id()->CopyFrom(slaveId);
status.set_state(TASK_STAGING); // Dummy value.
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/registrar_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp
index f93129f..34365c7 100644
--- a/src/tests/registrar_tests.cpp
+++ b/src/tests/registrar_tests.cpp
@@ -1214,7 +1214,7 @@ class MockStorage : public Storage
{
public:
MOCK_METHOD1(get, Future<Option<Entry>>(const string&));
- MOCK_METHOD2(set, Future<bool>(const Entry&, const UUID&));
+ MOCK_METHOD2(set, Future<bool>(const Entry&, const id::UUID&));
MOCK_METHOD1(expunge, Future<bool>(const Entry&));
MOCK_METHOD0(names, Future<std::set<string>>());
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/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 e069c62..b5edc6d 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -249,7 +249,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState)
ResourceProviderManager manager;
- Option<UUID> streamId;
+ Option<id::UUID> streamId;
Option<mesos::v1::ResourceProviderID> resourceProviderId;
// First, subscribe to the manager to get the ID.
@@ -278,7 +278,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState)
ASSERT_EQ(http::Response::PIPE, response->type);
ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
- Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response->headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
streamId = uuid.get();
@@ -318,7 +319,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState)
Call::UpdateState* updateState = call.mutable_update_state();
updateState->mutable_resources()->CopyFrom(v1::Resources(resources));
- updateState->set_resource_version_uuid(UUID::random().toBytes());
+ updateState->set_resource_version_uuid(id::UUID::random().toBytes());
http::Request request;
request.method = "POST";
@@ -354,7 +355,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
ResourceProviderManager manager;
- Option<UUID> streamId;
+ Option<id::UUID> streamId;
Option<mesos::v1::ResourceProviderID> resourceProviderId;
// First, subscribe to the manager to get the ID.
@@ -383,7 +384,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
ASSERT_EQ(http::Response::PIPE, response->type);
ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
- Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response->headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
streamId = uuid.get();
@@ -416,7 +418,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus)
mesos::v1::OfferOperationStatus status;
status.set_state(mesos::v1::OfferOperationState::OFFER_OPERATION_FINISHED);
- UUID operationUUID = UUID::random();
+ id::UUID operationUUID = id::UUID::random();
Call call;
call.set_type(Call::UPDATE_OFFER_OPERATION_STATUS);
@@ -471,7 +473,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess)
ResourceProviderManager manager;
- Option<UUID> streamId;
+ Option<id::UUID> streamId;
Option<mesos::v1::ResourceProviderID> resourceProviderId;
Owned<recordio::Reader<Event>> responseDecoder;
@@ -501,7 +503,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess)
ASSERT_EQ(http::Response::PIPE, response->type);
ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
- Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response->headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
streamId = uuid.get();
@@ -577,7 +580,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure)
ResourceProviderManager manager;
- Option<UUID> streamId;
+ Option<id::UUID> streamId;
Option<mesos::v1::ResourceProviderID> resourceProviderId;
Owned<recordio::Reader<Event>> responseDecoder;
@@ -607,7 +610,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure)
ASSERT_EQ(http::Response::PIPE, response->type);
ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id"));
- Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id"));
+ Try<id::UUID> uuid =
+ id::UUID::fromString(response->headers.at("Mesos-Stream-Id"));
CHECK_SOME(uuid);
streamId = uuid.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/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 bf789a0..22c7742 100644
--- a/src/tests/resource_provider_validation_tests.cpp
+++ b/src/tests/resource_provider_validation_tests.cpp
@@ -64,7 +64,7 @@ TEST(ResourceProviderCallValidationTest, UpdateOfferOperationStatus)
EXPECT_SOME(error);
ResourceProviderID* id = call.mutable_resource_provider_id();
- id->set_value(UUID::random().toString());
+ id->set_value(id::UUID::random().toString());
// Still expecting `Call::UpdateOfferOperationStatus`.
error = call::validate(call);
@@ -73,11 +73,11 @@ TEST(ResourceProviderCallValidationTest, UpdateOfferOperationStatus)
Call::UpdateOfferOperationStatus* update =
call.mutable_update_offer_operation_status();
- update->mutable_framework_id()->set_value(UUID::random().toString());
- update->set_operation_uuid(UUID::random().toBytes());
+ update->mutable_framework_id()->set_value(id::UUID::random().toString());
+ update->set_operation_uuid(id::UUID::random().toBytes());
OfferOperationStatus* status = update->mutable_status();
- status->mutable_operation_id()->set_value(UUID::random().toString());
+ status->mutable_operation_id()->set_value(id::UUID::random().toString());
status->set_state(OFFER_OPERATION_FINISHED);
error = call::validate(call);
@@ -95,14 +95,14 @@ TEST(ResourceProviderCallValidationTest, UpdateState)
EXPECT_SOME(error);
ResourceProviderID* id = call.mutable_resource_provider_id();
- id->set_value(UUID::random().toString());
+ id->set_value(id::UUID::random().toString());
// Still expecting `Call::UpdateState`.
error = call::validate(call);
EXPECT_SOME(error);
Call::UpdateState* updateState = call.mutable_update_state();
- updateState->set_resource_version_uuid(UUID::random().toBytes());
+ updateState->set_resource_version_uuid(id::UUID::random().toBytes());
error = call::validate(call);
EXPECT_NONE(error);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/scheduler_event_call_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_event_call_tests.cpp b/src/tests/scheduler_event_call_tests.cpp
index 48649f2..88813c4 100644
--- a/src/tests/scheduler_event_call_tests.cpp
+++ b/src/tests/scheduler_event_call_tests.cpp
@@ -539,7 +539,8 @@ TEST_F(SchedulerDriverEventTest, Update)
AWAIT_READY(statusUpdate);
// Generate an update that requires acknowledgement.
- event.mutable_update()->mutable_status()->set_uuid(UUID::random().toBytes());
+ event.mutable_update()->mutable_status()->set_uuid(
+ id::UUID::random().toBytes());
Future<mesos::scheduler::Call> acknowledgement = DROP_CALL(
mesos::scheduler::Call(), mesos::scheduler::Call::ACKNOWLEDGE, _, _);
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/scheduler_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp
index 67782ed..02cfe54 100644
--- a/src/tests/scheduler_http_api_tests.cpp
+++ b/src/tests/scheduler_http_api_tests.cpp
@@ -379,7 +379,7 @@ TEST_P(SchedulerHttpApiTest, SubscribeWithStreamId)
process::http::Headers headers = createBasicAuthHeaders(DEFAULT_CREDENTIAL);
headers["Accept"] = contentType;
- headers["Mesos-Stream-Id"] = UUID::random().toString();
+ headers["Mesos-Stream-Id"] = id::UUID::random().toString();
Future<Response> response = process::http::streaming::post(
master.get()->pid,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp
index b7e8d3d..4ba0b8e 100644
--- a/src/tests/slave_authorization_tests.cpp
+++ b/src/tests/slave_authorization_tests.cpp
@@ -850,7 +850,7 @@ TEST_F(ExecutorAuthorizationTest, FailedSubscribe)
hashmap<string, string> claims;
claims["fid"] = frameworkId.value();
claims["eid"] = v1::DEFAULT_EXECUTOR_ID.value();
- claims["cid"] = UUID::random().toString();
+ claims["cid"] = id::UUID::random().toString();
Principal principal(None(), claims);
@@ -1059,7 +1059,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls)
hashmap<string, string> claims;
claims["fid"] = frameworkId.value();
claims["eid"] = v1::DEFAULT_EXECUTOR_ID.value();
- claims["cid"] = UUID::random().toString();
+ claims["cid"] = id::UUID::random().toString();
Principal incorrectPrincipal(None(), claims);
@@ -1074,7 +1074,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls)
AWAIT_READY(authenticationToken);
v1::ContainerID containerId;
- containerId.set_value(UUID::random().toString());
+ containerId.set_value(id::UUID::random().toString());
containerId.mutable_parent()->CopyFrom(executorSubscribed->container_id());
http::Headers headers;
@@ -1194,9 +1194,9 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls)
{
v1::TaskStatus status;
- status.mutable_task_id()->set_value(UUID::random().toString());
+ status.mutable_task_id()->set_value(id::UUID::random().toString());
status.set_state(v1::TASK_RUNNING);
- status.set_uuid(UUID::random().toBytes());
+ status.set_uuid(id::UUID::random().toBytes());
status.set_source(v1::TaskStatus::SOURCE_EXECUTOR);
v1::executor::Call call;
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 555f186..bf2c5fc 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -334,7 +334,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
.tasks[task.task_id()]
.updates.front().uuid());
- const UUID uuid = UUID::fromBytes(ack->acknowledge().uuid()).get();
+ const id::UUID uuid = id::UUID::fromBytes(ack->acknowledge().uuid()).get();
ASSERT_TRUE(state
.frameworks[frameworkId]
.executors[executorId]