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 <[email protected]> Authored: Tue Feb 28 16:14:07 2017 -0800 Committer: Neil Conway <[email protected]> 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());
