Repository: mesos Updated Branches: refs/heads/master ec2124196 -> 2d715ec12
Fixed minor style issues in LinuxLauncher. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/25a954f1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/25a954f1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/25a954f1 Branch: refs/heads/master Commit: 25a954f1fe166580de3c0c932a5342353cff3f1c Parents: ec21241 Author: Joris Van Remoortere <[email protected]> Authored: Thu Sep 24 11:02:29 2015 -0700 Committer: Joris Van Remoortere <[email protected]> Committed: Thu Sep 24 11:02:29 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/linux_launcher.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/25a954f1/src/slave/containerizer/linux_launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp index 2e0ae70..6e266bd 100644 --- a/src/slave/containerizer/linux_launcher.cpp +++ b/src/slave/containerizer/linux_launcher.cpp @@ -139,8 +139,8 @@ Try<Launcher*> LinuxLauncher::create(const Flags& flags) Try<Nothing> create = systemd::slices::create(path, unit); if (create.isError()) { - return Error("Failed to create systemd slice `" + - stringify(SYSTEMD_MESOS_EXECUTORS_SLICE) + "`: " + + return Error("Failed to create systemd slice '" + + stringify(SYSTEMD_MESOS_EXECUTORS_SLICE) + "': " + create.error()); } } @@ -151,9 +151,9 @@ Try<Launcher*> LinuxLauncher::create(const Flags& flags) Try<Nothing> start = systemd::slices::start(SYSTEMD_MESOS_EXECUTORS_SLICE); if (start.isError()) { - return Error("Failed to start `" + + return Error("Failed to start '" + stringify(SYSTEMD_MESOS_EXECUTORS_SLICE) + - "`: " + start.error()); + "': " + start.error()); } // Now the `SYSTEMD_MESOS_EXECUTORS_SLICE` is ready for us to assign any @@ -194,8 +194,8 @@ Future<hashset<ContainerID>> LinuxLauncher::recover( // `SYSTEMD_MESOS_EXECUTORS_SLICE` we fail. This is a programmer error as we // did not set up the slice correctly. if (mesosExecutorSlicePids.isError()) { - return Failure("Failed to read pids from systemd `" + - stringify(SYSTEMD_MESOS_EXECUTORS_SLICE) + "`"); + return Failure("Failed to read pids from systemd '" + + stringify(SYSTEMD_MESOS_EXECUTORS_SLICE) + "'"); } } @@ -243,8 +243,8 @@ Future<hashset<ContainerID>> LinuxLauncher::recover( if (systemdHierarchy.isSome() && mesosExecutorSlicePids.isSome()) { if (mesosExecutorSlicePids.get().count(pid) <= 0) { LOG(WARNING) - << "Couldn't find pid `" << pid << "` in `" - << SYSTEMD_MESOS_EXECUTORS_SLICE << "`. This can lead to lack of" + << "Couldn't find pid '" << pid << "' in '" + << SYSTEMD_MESOS_EXECUTORS_SLICE << "'. This can lead to lack of" << " proper resource isolation"; } } @@ -406,8 +406,8 @@ Try<pid_t> LinuxLauncher::fork( return Error("Failed to contain process on systemd"); } - LOG(INFO) << "Assigned child process `" << child.get().pid() << "` to `" - << SYSTEMD_MESOS_EXECUTORS_SLICE << "`"; + LOG(INFO) << "Assigned child process '" << child.get().pid() << "' to '" + << SYSTEMD_MESOS_EXECUTORS_SLICE << "'"; } // Now that we've contained the child we can signal it to continue
