You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:32:38 UTC
[45/50] mesos git commit: Fix CGROUPS_ROOT_* tests on systemd
platforms.
Fix CGROUPS_ROOT_* tests on systemd platforms.
Tests do not run with systemd configured, so any dependency on systemd
will fail some checks.
This fixes the `LinuxLauncher` to use the correct systemd-guard function.
Review: https://reviews.apache.org/r/43432/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a896cda4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a896cda4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a896cda4
Branch: refs/heads/0.26.x
Commit: a896cda4aa8bb9c9bbfba20dda4b68df8dbdf569
Parents: a05261d
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Wed Feb 10 16:40:02 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Tue Mar 8 16:20:26 2016 -0500
----------------------------------------------------------------------
src/slave/containerizer/linux_launcher.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a896cda4/src/slave/containerizer/linux_launcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp
index 35f8db2..fbe88cd 100644
--- a/src/slave/containerizer/linux_launcher.cpp
+++ b/src/slave/containerizer/linux_launcher.cpp
@@ -113,7 +113,7 @@ Try<Launcher*> LinuxLauncher::create(const Flags& flags)
return new LinuxLauncher(
flags,
freezerHierarchy.get(),
- systemd::exists() ?
+ systemd::enabled() ?
Some(systemd::hierarchy()) :
Option<std::string>::none());
}