You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/09/24 18:08:33 UTC
[3/5] mesos git commit: Updated check for instantiating the "windows"
launcher.
Updated check for instantiating the "windows" launcher.
Previously, we allowed the posix launcher to specified on windows and
just blindly ignored it and instantiated a windows launcher anyway.
This was likely due to legacy code, not setting the default launcher
properly in flags.cpp. Now that we set the default to "windows"
properly, this hack is no longer needed.
Review: https://reviews.apache.org/r/52224/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9c1e81e9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9c1e81e9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9c1e81e9
Branch: refs/heads/master
Commit: 9c1e81e91eba17487d36ecad12b8e04b9c52aef2
Parents: a5ff5fe
Author: Kevin Klues <kl...@gmail.com>
Authored: Sat Sep 24 10:58:27 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sat Sep 24 10:58:27 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9c1e81e9/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 144b0db..ed3089a 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -235,9 +235,7 @@ Try<MesosContainerizer*> MesosContainerizer::create(
return Error("Unknown or unsupported launcher: " + flags_.launcher);
}
#elif __WINDOWS__
- // NOTE: Because the most basic launcher historically has been "posix", we
- // accept this flag on Windows, but map it to the `WindowsLauncher`.
- if (flags_.launcher != "posix" && flags_.launcher != "windows") {
+ if (flags_.launcher != "windows") {
return Error("Unsupported launcher: " + flags_.launcher);
}