You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/03/01 00:14:47 UTC
[1/3] mesos git commit: Fixed some clang-tidy warnings.
Repository: mesos
Updated Branches:
refs/heads/master 5eb72ec74 -> fbdbf08fa
Fixed some clang-tidy warnings.
Review: https://reviews.apache.org/r/56806/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c9dfe1e0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c9dfe1e0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c9dfe1e0
Branch: refs/heads/master
Commit: c9dfe1e053405140f68eba012905ad300ea03ca2
Parents: 5eb72ec
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Feb 28 16:14:07 2017 -0800
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue Feb 28 16:14:26 2017 -0800
----------------------------------------------------------------------
src/common/protobuf_utils.cpp | 4 +--
src/master/detector/detector.cpp | 2 +-
src/slave/slave.cpp | 4 +--
.../docker_containerizer_tests.cpp | 27 +++++++-------------
src/tests/fetcher_cache_tests.cpp | 4 +--
src/tests/gc_tests.cpp | 2 +-
src/tests/hook_tests.cpp | 2 --
src/tests/partition_tests.cpp | 22 ++++++++--------
src/tests/persistent_volume_endpoints_tests.cpp | 4 +--
9 files changed, 29 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 944263b..34c14e8 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -254,7 +254,7 @@ Option<bool> getTaskHealth(const Task& task)
// each state, and appends later statuses at the end. Thus the last
// status is either a terminal state (where health is irrelevant),
// or the latest TASK_RUNNING status.
- TaskStatus lastStatus = task.statuses(task.statuses_size() - 1);
+ const TaskStatus& lastStatus = task.statuses(task.statuses_size() - 1);
if (lastStatus.has_healthy()) {
healthy = lastStatus.healthy();
}
@@ -271,7 +271,7 @@ Option<CheckStatusInfo> getTaskCheckStatus(const Task& task)
// each state, and appends later statuses at the end. Thus the last
// status is either a terminal state (where check is irrelevant),
// or the latest TASK_RUNNING status.
- TaskStatus lastStatus = task.statuses(task.statuses_size() - 1);
+ const TaskStatus& lastStatus = task.statuses(task.statuses_size() - 1);
if (lastStatus.has_check_status()) {
checkStatus = lastStatus.check_status();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/master/detector/detector.cpp
----------------------------------------------------------------------
diff --git a/src/master/detector/detector.cpp b/src/master/detector/detector.cpp
index 1ebe5af..0ba29ca 100644
--- a/src/master/detector/detector.cpp
+++ b/src/master/detector/detector.cpp
@@ -56,7 +56,7 @@ Try<MasterDetector*> MasterDetector::create(
return new StandaloneMasterDetector();
}
- string zk = zk_.get();
+ const string& zk = zk_.get();
if (strings::startsWith(zk, "zk://")) {
Try<zookeeper::URL> url = zookeeper::URL::parse(zk);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index fc480ae..892ce19 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -6483,7 +6483,7 @@ Executor* Framework::launchExecutor(
<< " with resources " << executorInfo.resources()
<< " in work directory '" << directory << "'";
- ExecutorID executorId = executorInfo.executor_id();
+ const ExecutorID& executorId = executorInfo.executor_id();
FrameworkID frameworkId = id();
const PID<Slave> slavePid = slave->self();
@@ -6800,8 +6800,6 @@ void Framework::recoverExecutor(const ExecutorState& state)
// Move the executor to 'completedExecutors'.
destroyExecutor(executor->id);
}
-
- return;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/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 e760f47..6484533 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -1773,9 +1773,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverPersistentVolumes)
AWAIT_READY(offers);
ASSERT_NE(0u, offers.get().size());
- Offer offer = offers.get()[0];
-
- SlaveID slaveId = offer.slave_id();
+ const Offer& offer = offers.get()[0];
Resource volume = createPersistentVolume(
Megabytes(64),
@@ -1938,7 +1936,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_RecoverOrphanedPersistentVolumes)
AWAIT_READY(offers);
ASSERT_NE(0u, offers.get().size());
- Offer offer = offers.get()[0];
+ const Offer& offer = offers.get()[0];
Resource volume = createPersistentVolume(
Megabytes(64),
@@ -2241,8 +2239,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("1");
@@ -2648,8 +2644,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("1");
@@ -2726,7 +2720,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
AWAIT_READY(status);
ASSERT_EQ(TASK_RUNNING, status.get().state());
- ASSERT_TRUE(exists(docker, slaveId, containerId.get()));
+ ASSERT_TRUE(exists(docker, offer.slave_id(), containerId.get()));
Future<Option<ContainerTermination>> termination =
dockerContainerizer->wait(containerId.get());
@@ -2985,8 +2979,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("1");
@@ -3041,7 +3033,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NC_PortMapping)
EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
ASSERT_TRUE(
- exists(docker, slaveId, containerId.get(), ContainerState::RUNNING));
+ exists(docker,
+ offer.slave_id(),
+ containerId.get(),
+ ContainerState::RUNNING));
string uuid = UUID::random().toString();
@@ -3133,8 +3128,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("test:colon");
@@ -3172,7 +3165,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
AWAIT_READY_FOR(statusRunning, Seconds(60));
EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
- ASSERT_TRUE(exists(docker, slaveId, containerId.get()));
+ ASSERT_TRUE(exists(docker, offer.slave_id(), containerId.get()));
Future<Option<ContainerTermination>> termination =
dockerContainerizer.wait(containerId.get());
@@ -4136,8 +4129,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("1");
@@ -4178,7 +4169,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_CGROUPS_CFS_CgroupsEnableCFS)
// Find cgroups cpu hierarchy of the container and verifies
// quota is set.
- string name = containerName(slaveId, containerId.get());
+ string name = containerName(offer.slave_id(), containerId.get());
Future<Docker::Container> inspect = docker->inspect(name);
AWAIT_READY(inspect);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/tests/fetcher_cache_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fetcher_cache_tests.cpp b/src/tests/fetcher_cache_tests.cpp
index e5eee9b..85246ef 100644
--- a/src/tests/fetcher_cache_tests.cpp
+++ b/src/tests/fetcher_cache_tests.cpp
@@ -390,7 +390,7 @@ static Future<list<Nothing>> awaitFinished(
// given queue, which later on shall be queried by awaitFinished().
ACTION_P(PushTaskStatus, taskStatusQueue)
{
- TaskStatus taskStatus = arg1;
+ const TaskStatus& taskStatus = arg1;
// Input parameters of ACTION_P are const. We make a mutable copy
// so that we can use put().
@@ -479,7 +479,7 @@ ACTION_TEMPLATE(PushIndexedTaskStatus,
HAS_1_TEMPLATE_PARAMS(int, k),
AND_1_VALUE_PARAMS(tasks))
{
- TaskStatus taskStatus = ::std::tr1::get<k>(args);
+ const TaskStatus& taskStatus = ::std::tr1::get<k>(args);
Try<int> taskId = numify<int>(taskStatus.task_id().value());
ASSERT_SOME(taskId);
Queue<TaskStatus> queue = (tasks)[taskId.get()].statusQueue;
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/tests/gc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp
index 293c146..6b6437c 100644
--- a/src/tests/gc_tests.cpp
+++ b/src/tests/gc_tests.cpp
@@ -891,7 +891,7 @@ TEST_F(GarbageCollectorIntegrationTest, ROOT_BusyMountPoint)
EXPECT_FALSE(offers.get().empty());
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
+ const SlaveID& slaveId = offer.slave_id();
// The busy mount point goes before the regular file in GC's
// directory traversal due to their names. This makes sure that
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 237df81..95dcfb6 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -892,8 +892,6 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
const Offer& offer = offers.get()[0];
- SlaveID slaveId = offer.slave_id();
-
TaskInfo task;
task.set_name("");
task.mutable_task_id()->set_value("1");
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/tests/partition_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp
index 105157d..2f5c694 100644
--- a/src/tests/partition_tests.cpp
+++ b/src/tests/partition_tests.cpp
@@ -230,7 +230,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlavePartitionAware)
EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
- const SlaveID slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus.get().slave_id();
AWAIT_READY(statusUpdateAck);
@@ -587,7 +587,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, ReregisterSlaveNotPartitionAware)
EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
- const SlaveID slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus.get().slave_id();
AWAIT_READY(statusUpdateAck);
@@ -889,7 +889,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
EXPECT_EQ(TASK_RUNNING, runningStatus1.get().state());
EXPECT_EQ(task1.task_id(), runningStatus1.get().task_id());
- const SlaveID slaveId = runningStatus1.get().slave_id();
+ const SlaveID& slaveId = runningStatus1.get().slave_id();
AWAIT_READY(statusUpdateAck1);
@@ -1151,7 +1151,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveOrphanedTask)
EXPECT_EQ(TASK_RUNNING, runningStatus->state());
EXPECT_EQ(task.task_id(), runningStatus->task_id());
- const SlaveID slaveId = runningStatus->slave_id();
+ const SlaveID& slaveId = runningStatus->slave_id();
AWAIT_READY(statusUpdateAck);
@@ -1419,7 +1419,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, DisconnectedFramework)
EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
- const SlaveID slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus.get().slave_id();
AWAIT_READY(statusUpdateAck1);
@@ -1588,7 +1588,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, SpuriousSlaveReregistration)
EXPECT_EQ(TASK_RUNNING, runningStatus.get().state());
EXPECT_EQ(task.task_id(), runningStatus.get().task_id());
- const SlaveID slaveId = runningStatus.get().slave_id();
+ const SlaveID& slaveId = runningStatus.get().slave_id();
AWAIT_READY(statusUpdateAck);
@@ -1664,7 +1664,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates)
Clock::advance(agentFlags.registration_backoff_factor);
AWAIT_READY(slaveRegisteredMessage);
- SlaveID slaveId = slaveRegisteredMessage.get().slave_id();
+ const SlaveID& slaveId = slaveRegisteredMessage.get().slave_id();
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -1955,8 +1955,8 @@ TEST_F(PartitionTest, TaskCompletedOnPartitionedAgent)
AWAIT_READY(offers);
ASSERT_FALSE(offers->empty());
- Offer offer = offers->at(0);
- SlaveID slaveId = offer.slave_id();
+ const Offer& offer = offers->at(0);
+ const SlaveID& slaveId = offer.slave_id();
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
@@ -2192,8 +2192,8 @@ TEST_F(PartitionTest, PartitionAwareTaskCompletedOnPartitionedAgent)
AWAIT_READY(offers);
ASSERT_FALSE(offers->empty());
- Offer offer = offers->at(0);
- SlaveID slaveId = offer.slave_id();
+ const Offer& offer = offers->at(0);
+ const SlaveID& slaveId = offer.slave_id();
ExecutorDriver* execDriver;
EXPECT_CALL(exec, registered(_, _, _, _))
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9dfe1e0/src/tests/persistent_volume_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_endpoints_tests.cpp b/src/tests/persistent_volume_endpoints_tests.cpp
index 1cc6c9d..34d569c 100644
--- a/src/tests/persistent_volume_endpoints_tests.cpp
+++ b/src/tests/persistent_volume_endpoints_tests.cpp
@@ -1911,8 +1911,8 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
createReservationInfo(DEFAULT_CREDENTIAL.principal())).get();
for (size_t i = 0; i < offers.get().size(); i++) {
- Offer offer = offers.get()[i];
- SlaveID offeredSlaveId = offer.slave_id();
+ const Offer& offer = offers.get()[i];
+ const SlaveID& offeredSlaveId = offer.slave_id();
ASSERT_TRUE(offeredSlaveId == slave1Id.get() ||
offeredSlaveId == slave2Id.get());
[3/3] mesos git commit: Cleaned up header includes.
Posted by ne...@apache.org.
Cleaned up header includes.
Review: https://reviews.apache.org/r/57161/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fbdbf08f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fbdbf08f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fbdbf08f
Branch: refs/heads/master
Commit: fbdbf08faeb30e9ec0e30e2440e2dce8737671af
Parents: 0e0d327
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Feb 28 16:14:15 2017 -0800
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue Feb 28 16:14:29 2017 -0800
----------------------------------------------------------------------
src/linux/capabilities.cpp | 2 +-
src/linux/capabilities.hpp | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fbdbf08f/src/linux/capabilities.cpp
----------------------------------------------------------------------
diff --git a/src/linux/capabilities.cpp b/src/linux/capabilities.cpp
index b9d65df..7aa8c35 100644
--- a/src/linux/capabilities.cpp
+++ b/src/linux/capabilities.cpp
@@ -20,6 +20,7 @@
#include <sys/prctl.h>
+#include <set>
#include <string>
#include <stout/numify.hpp>
@@ -32,7 +33,6 @@
using std::hex;
using std::ostream;
using std::string;
-using std::vector;
// We declare two functions provided in the libcap headers here to
// prevent introduction of that build-time dependency.
http://git-wip-us.apache.org/repos/asf/mesos/blob/fbdbf08f/src/linux/capabilities.hpp
----------------------------------------------------------------------
diff --git a/src/linux/capabilities.hpp b/src/linux/capabilities.hpp
index 7c63427..5fa3799 100644
--- a/src/linux/capabilities.hpp
+++ b/src/linux/capabilities.hpp
@@ -18,8 +18,6 @@
#define __LINUX_CAPABILITIES_HPP__
#include <set>
-#include <string>
-#include <vector>
#include <stout/flags.hpp>
#include <stout/nothing.hpp>
@@ -126,7 +124,7 @@ public:
* Factory method to create Capabilities object.
*
* @return `Capabilities` on success;
- * Error on falure. Failure conditions could be:
+ * Error on failure. Failure conditions could be:
* - Error getting system information (e.g, version).
* - Unsupported linux kernel capabilities version.
* - Maximum capability supported by kernel exceeds the
[2/3] mesos git commit: Cleaned up `using` statements.
Posted by ne...@apache.org.
Cleaned up `using` statements.
A source file should typically not contain both `using xyz::foo` and
`xyz::foo`.
Review: https://reviews.apache.org/r/57157/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0e0d3279
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0e0d3279
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0e0d3279
Branch: refs/heads/master
Commit: 0e0d3279724c5162b4e5940487dece3ecd2bdd74
Parents: c9dfe1e
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Feb 28 16:14:12 2017 -0800
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue Feb 28 16:14:29 2017 -0800
----------------------------------------------------------------------
src/linux/capabilities.cpp | 17 +++++++--------
src/master/weights_handler.cpp | 2 +-
src/slave/containerizer/docker.cpp | 2 +-
.../isolators/cgroups/subsystems/net_cls.cpp | 4 ++--
.../mesos/isolators/gpu/allocator.cpp | 4 ++--
.../cni/plugins/port_mapper/port_mapper.cpp | 2 +-
.../containerizer/mesos/linux_launcher.cpp | 22 ++++++++++----------
src/slave/containerizer/mesos/paths.cpp | 8 +++----
src/slave/flags.cpp | 6 +++---
src/tests/container_logger_tests.cpp | 4 ++--
.../containerizer/mesos_containerizer_tests.cpp | 4 ++--
src/tests/containerizer/rootfs.cpp | 4 ++--
12 files changed, 39 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/linux/capabilities.cpp
----------------------------------------------------------------------
diff --git a/src/linux/capabilities.cpp b/src/linux/capabilities.cpp
index 9f46bd0..b9d65df 100644
--- a/src/linux/capabilities.cpp
+++ b/src/linux/capabilities.cpp
@@ -31,7 +31,6 @@
using std::hex;
using std::ostream;
-using std::set;
using std::string;
using std::vector;
@@ -104,7 +103,7 @@ struct SyscallPayload
// Helper function to convert capability set to bitset.
-static uint64_t toCapabilityBitset(const set<Capability>& capabilities)
+static uint64_t toCapabilityBitset(const std::set<Capability>& capabilities)
{
uint64_t result = 0;
@@ -119,9 +118,9 @@ static uint64_t toCapabilityBitset(const set<Capability>& capabilities)
// Helper function to convert capability bitset to std::set.
-static set<Capability> toCapabilitySet(uint64_t bitset)
+static std::set<Capability> toCapabilitySet(uint64_t bitset)
{
- set<Capability> result;
+ std::set<Capability> result;
for (int i = 0; i < MAX_CAPABILITY; i++) {
if ((bitset & (1ULL << i)) != 0) {
@@ -133,7 +132,7 @@ static set<Capability> toCapabilitySet(uint64_t bitset)
}
-set<Capability> ProcessCapabilities::get(const Type& type) const
+std::set<Capability> ProcessCapabilities::get(const Type& type) const
{
switch (type) {
case EFFECTIVE: return effective;
@@ -319,7 +318,7 @@ Try<Nothing> Capabilities::setKeepCaps()
}
-set<Capability> Capabilities::getAllSupportedCapabilities()
+std::set<Capability> Capabilities::getAllSupportedCapabilities()
{
std::set<Capability> result;
@@ -342,9 +341,9 @@ Capability convert(const CapabilityInfo::Capability& capability)
}
-set<Capability> convert(const CapabilityInfo& capabilityInfo)
+std::set<Capability> convert(const CapabilityInfo& capabilityInfo)
{
- set<Capability> result;
+ std::set<Capability> result;
foreach (int value, capabilityInfo.capabilities()) {
result.insert(convert(static_cast<CapabilityInfo::Capability>(value)));
@@ -354,7 +353,7 @@ set<Capability> convert(const CapabilityInfo& capabilityInfo)
}
-CapabilityInfo convert(const set<Capability>& capabilities)
+CapabilityInfo convert(const std::set<Capability>& capabilities)
{
CapabilityInfo capabilityInfo;
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/master/weights_handler.cpp
----------------------------------------------------------------------
diff --git a/src/master/weights_handler.cpp b/src/master/weights_handler.cpp
index 4f6a4cd..d8047f2 100644
--- a/src/master/weights_handler.cpp
+++ b/src/master/weights_handler.cpp
@@ -342,7 +342,7 @@ Future<bool> Master::WeightsHandler::authorizeUpdateWeights(
}
return await(authorizations)
- .then([](const std::list<Future<bool>>& authorizations)
+ .then([](const list<Future<bool>>& authorizations)
-> Future<bool> {
// Compute a disjunction.
foreach (const Future<bool>& authorization, authorizations) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 7d801fb..823a39e 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -1427,7 +1427,7 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess(
// be overwritten if they are specified by the framework. This might cause
// applications to not work, but upon overriding system defaults, it becomes
// the overidder's problem.
- Option<std::map<string, string>> systemEnvironment =
+ Option<map<string, string>> systemEnvironment =
process::internal::getSystemEnvironment();
foreachpair(const string& key, const string& value,
systemEnvironment.get()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp
index 2608df1..ba563a4 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp
@@ -448,8 +448,8 @@ Future<Nothing> NetClsSubsystem::cleanup(
Result<NetClsHandle> NetClsSubsystem::recoverHandle(
- const std::string& hierarchy,
- const std::string& cgroup)
+ const string& hierarchy,
+ const string& cgroup)
{
Try<uint32_t> classid = cgroups::net_cls::classid(hierarchy, cgroup);
if (classid.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp b/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp
index 2e72269..c288ad6 100644
--- a/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp
+++ b/src/slave/containerizer/mesos/isolators/gpu/allocator.cpp
@@ -249,7 +249,7 @@ class NvidiaGpuAllocatorProcess
: public process::Process<NvidiaGpuAllocatorProcess>
{
public:
- NvidiaGpuAllocatorProcess(const std::set<Gpu>& gpus)
+ NvidiaGpuAllocatorProcess(const set<Gpu>& gpus)
: available(gpus) {}
Future<set<Gpu>> allocate(size_t count)
@@ -314,7 +314,7 @@ struct NvidiaGpuAllocator::Data
process::terminate(process);
}
- const std::set<Gpu> gpus;
+ const set<Gpu> gpus;
PID<NvidiaGpuAllocatorProcess> process;
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
index d0cf80b..1be8c23 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
@@ -491,7 +491,7 @@ Try<Option<string>, PluginError> PortMapper::execute()
Result<spec::NetworkInfo> PortMapper::delegate(const string& command)
{
- map<std::string, std::string> environment;
+ map<string, string> environment;
environment["CNI_COMMAND"] = command;
environment["CNI_IFNAME"] = cniIfName;
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/linux_launcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/linux_launcher.cpp b/src/slave/containerizer/mesos/linux_launcher.cpp
index a3409dc..80c9ab2 100644
--- a/src/slave/containerizer/mesos/linux_launcher.cpp
+++ b/src/slave/containerizer/mesos/linux_launcher.cpp
@@ -64,21 +64,21 @@ class LinuxLauncherProcess : public Process<LinuxLauncherProcess>
public:
LinuxLauncherProcess(
const Flags& flags,
- const std::string& freezerHierarchy,
- const Option<std::string>& systemdHierarchy);
+ const string& freezerHierarchy,
+ const Option<string>& systemdHierarchy);
virtual process::Future<hashset<ContainerID>> recover(
const std::list<mesos::slave::ContainerState>& states);
virtual Try<pid_t> fork(
const ContainerID& containerId,
- const std::string& path,
- const std::vector<std::string>& argv,
+ const string& path,
+ const vector<string>& argv,
const process::Subprocess::IO& in,
const process::Subprocess::IO& out,
const process::Subprocess::IO& err,
const flags::FlagsBase* flags,
- const Option<std::map<std::string, std::string>>& environment,
+ const Option<std::map<string, string>>& environment,
const Option<int>& enterNamespaces,
const Option<int>& cloneNamespaces);
@@ -109,16 +109,16 @@ private:
// Helper for determining the cgroup for a container (i.e., the path
// in a cgroup subsystem).
- std::string cgroup(const ContainerID& containerId);
+ string cgroup(const ContainerID& containerId);
// Helper for parsing the cgroup path to determine the container ID
// it belongs to.
Option<ContainerID> parse(const string& cgroup);
- static const std::string subsystem;
+ static const string subsystem;
const Flags flags;
- const std::string freezerHierarchy;
- const Option<std::string> systemdHierarchy;
+ const string freezerHierarchy;
+ const Option<string> systemdHierarchy;
hashmap<ContainerID, Container> containers;
};
@@ -205,7 +205,7 @@ Future<hashset<ContainerID>> LinuxLauncher::recover(
Try<pid_t> LinuxLauncher::fork(
const ContainerID& containerId,
const string& path,
- const vector<std::string>& argv,
+ const vector<string>& argv,
const process::Subprocess::IO& in,
const process::Subprocess::IO& out,
const process::Subprocess::IO& err,
@@ -330,7 +330,7 @@ Future<hashset<ContainerID>> LinuxLauncherProcess::recover(
// still in the `MESOS_EXECUTORS_SLICE`. If they are not, warn the
// operator that resource isolation may be invalidated.
if (systemdHierarchy.isSome()) {
- Result<std::set<pid_t>> mesosExecutorSlicePids = cgroups::processes(
+ Result<set<pid_t>> mesosExecutorSlicePids = cgroups::processes(
systemdHierarchy.get(),
systemd::mesos::MESOS_EXECUTORS_SLICE);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/containerizer/mesos/paths.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/paths.cpp b/src/slave/containerizer/mesos/paths.cpp
index c1770ce..ed4bbd2 100644
--- a/src/slave/containerizer/mesos/paths.cpp
+++ b/src/slave/containerizer/mesos/paths.cpp
@@ -160,7 +160,7 @@ string getContainerIOSwitchboardPidPath(
Result<pid_t> getContainerIOSwitchboardPid(
- const std::string& runtimeDir,
+ const string& runtimeDir,
const ContainerID& containerId)
{
const string path = getContainerIOSwitchboardPidPath(
@@ -230,8 +230,8 @@ Result<unix::Address> getContainerIOSwitchboardAddress(
#endif // __WINDOWS__
-std::string getContainerForceDestroyOnRecoveryPath(
- const std::string& runtimeDir,
+string getContainerForceDestroyOnRecoveryPath(
+ const string& runtimeDir,
const ContainerID& containerId)
{
return path::join(
@@ -241,7 +241,7 @@ std::string getContainerForceDestroyOnRecoveryPath(
bool getContainerForceDestroyOnRecovery(
- const std::string& runtimeDir,
+ const string& runtimeDir,
const ContainerID& containerId)
{
const string path = getContainerForceDestroyOnRecoveryPath(
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 8de2643..4637ca6 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -216,12 +216,12 @@ mesos::internal::slave::Flags::Flags()
"not across reboots). This directory will be cleared on reboot.\n"
"(Example: `/var/run/mesos`)",
[]() -> string {
- Try<std::string> var = os::var();
+ Try<string> var = os::var();
if (var.isSome()) {
#ifdef __WINDOWS__
- const std::string prefix(var.get());
+ const string prefix(var.get());
#else
- const std::string prefix(path::join(var.get(), "run"));
+ const string prefix(path::join(var.get(), "run"));
#endif // __WINDOWS__
// We check for access on the prefix because the remainder
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/tests/container_logger_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/container_logger_tests.cpp b/src/tests/container_logger_tests.cpp
index 589d6a9..5f2a7b0 100644
--- a/src/tests/container_logger_tests.cpp
+++ b/src/tests/container_logger_tests.cpp
@@ -434,7 +434,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
AWAIT_READY(offers);
EXPECT_NE(0u, offers.get().size());
- const std::string customConfig = "some-custom-logrotate-option";
+ const string customConfig = "some-custom-logrotate-option";
TaskInfo task = createTask(offers.get()[0], "exit 0");
@@ -479,7 +479,7 @@ TEST_F(ContainerLoggerTest, LOGROTATE_CustomRotateOptions)
string stdoutPath = path::join(sandboxDirectory, "stdout.logrotate.conf");
ASSERT_TRUE(os::exists(stdoutPath));
- Try<std::string> stdoutConfig = os::read(stdoutPath);
+ Try<string> stdoutConfig = os::read(stdoutPath);
ASSERT_SOME(stdoutConfig);
ASSERT_TRUE(strings::contains(stdoutConfig.get(), customConfig));
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/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 039f197..683807f 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -682,12 +682,12 @@ TEST_F(MesosContainerizerExecuteTest, ROOT_SandboxFileOwnership)
// Verify that stdout is owned by the task user.
struct stat s;
- std::string stdoutPath = path::join(sandbox, "stdout");
+ string stdoutPath = path::join(sandbox, "stdout");
EXPECT_EQ(0, ::stat(stdoutPath.c_str(), &s));
EXPECT_EQ(uid.get(), s.st_uid);
// Verify that stderr is owned by the task user.
- std::string stderrPath = path::join(sandbox, "stderr");
+ string stderrPath = path::join(sandbox, "stderr");
EXPECT_EQ(0, ::stat(stderrPath.c_str(), &s));
EXPECT_EQ(uid.get(), s.st_uid);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e0d3279/src/tests/containerizer/rootfs.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/rootfs.cpp b/src/tests/containerizer/rootfs.cpp
index 513c1b5..fdfecc6 100644
--- a/src/tests/containerizer/rootfs.cpp
+++ b/src/tests/containerizer/rootfs.cpp
@@ -125,7 +125,7 @@ Try<process::Owned<Rootfs>> LinuxRootfs::create(const string& root)
return Error("Failed to parse ld.so cache: " + cache.error());
}
- const std::vector<string> programs = {
+ const vector<string> programs = {
"/bin/echo",
"/bin/ls",
"/bin/ping",
@@ -156,7 +156,7 @@ Try<process::Owned<Rootfs>> LinuxRootfs::create(const string& root)
}
}
- const std::vector<string> directories = {
+ const vector<string> directories = {
"/proc",
"/sys",
"/dev",