You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/11 01:54:03 UTC
mesos git commit: Fix CGROUPS_ROOT_* tests on systemd platforms.
Repository: mesos
Updated Branches:
refs/heads/master 84c6b714d -> f2a71af11
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/f2a71af1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f2a71af1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f2a71af1
Branch: refs/heads/master
Commit: f2a71af11eb3af6d8d329742962f37a907d9967e
Parents: 84c6b71
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Wed Feb 10 16:40:02 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Wed Feb 10 16:40:02 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/linux_launcher.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f2a71af1/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 d38c7a9..9c80cfb 100644
--- a/src/slave/containerizer/mesos/linux_launcher.cpp
+++ b/src/slave/containerizer/mesos/linux_launcher.cpp
@@ -111,7 +111,7 @@ Try<Launcher*> LinuxLauncher::create(const Flags& flags)
return new LinuxLauncher(
flags,
freezerHierarchy.get(),
- systemd::exists() ?
+ systemd::enabled() ?
Some(systemd::hierarchy()) :
Option<string>::none());
}