Repository: mesos Updated Branches: refs/heads/master 6cf8b26a7 -> ba234941c
Fixed some style issues in docker containerizer and tests. Review: https://reviews.apache.org/r/40030 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ba234941 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ba234941 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ba234941 Branch: refs/heads/master Commit: ba234941ced335dd8ba58cac9fe3d1aa27f3e96f Parents: 6cf8b26 Author: Gilbert Song <[email protected]> Authored: Fri Nov 6 14:40:36 2015 -0800 Committer: Timothy Chen <[email protected]> Committed: Fri Nov 6 15:01:02 2015 -0800 ---------------------------------------------------------------------- src/slave/containerizer/docker.cpp | 22 +++++++++++----------- src/tests/mesos.hpp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ba234941/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 5e5e0f9..435631d 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -583,15 +583,15 @@ Future<Nothing> DockerContainerizerProcess::_recover( foreachvalue (const ExecutorState& executor, framework.executors) { if (executor.info.isNone()) { LOG(WARNING) << "Skipping recovery of executor '" << executor.id - << "' of framework " << framework.id - << " because its info could not be recovered"; + << "' of framework '" << framework.id + << "' because its info could not be recovered"; continue; } if (executor.latest.isNone()) { LOG(WARNING) << "Skipping recovery of executor '" << executor.id - << "' of framework " << framework.id - << " because its latest run could not be recovered"; + << "' of framework '" << framework.id + << "' because its latest run could not be recovered"; continue; } @@ -613,8 +613,8 @@ Future<Nothing> DockerContainerizerProcess::_recover( if (run.get().completed) { VLOG(1) << "Skipping recovery of executor '" << executor.id - << "' of framework " << framework.id - << " because its latest run " + << "' of framework '" << framework.id + << "' because its latest run " << containerId << " is completed"; continue; } @@ -623,23 +623,23 @@ Future<Nothing> DockerContainerizerProcess::_recover( if (executorInfo.has_container() && executorInfo.container().type() != ContainerInfo::DOCKER) { LOG(INFO) << "Skipping recovery of executor '" << executor.id - << "' of framework " << framework.id - << " because it was not launched from docker containerizer"; + << "' of framework '" << framework.id + << "' because it was not launched from docker containerizer"; continue; } if (!executorInfo.has_container() && !existingContainers.contains(containerId)) { LOG(INFO) << "Skipping recovery of executor '" << executor.id - << "' of framework " << framework.id - << " because its executor is not marked as docker " + << "' of framework '" << framework.id + << "' because its executor is not marked as docker " << "and the docker container doesn't exist"; continue; } LOG(INFO) << "Recovering container '" << containerId << "' for executor '" << executor.id - << "' of framework " << framework.id; + << "' of framework '" << framework.id << "'"; // Create and store a container. Container* container = new Container(containerId); http://git-wip-us.apache.org/repos/asf/mesos/blob/ba234941/src/tests/mesos.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index f731ac3..71eba8b 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -973,7 +973,7 @@ class MockDocker : public Docker public: MockDocker( const std::string& path, - const std::string &socket) + const std::string& socket) : Docker(path, socket) { EXPECT_CALL(*this, pull(_, _, _))
