You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/01/12 17:32:46 UTC

[07/10] mesos git commit: Ended `IOSwitchboard::_prepare` with `UNREACHABLE`.

Ended `IOSwitchboard::_prepare` with `UNREACHABLE`.

All paths should `return`, but the compiler wasn't able to determine
this.

Review: https://reviews.apache.org/r/64731


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9db04150
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9db04150
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9db04150

Branch: refs/heads/master
Commit: 9db0415007722d45c4ab7539a454b70ba955bfc0
Parents: 177a222
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Tue Dec 12 16:02:30 2017 -0800
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Fri Jan 12 09:29:17 2018 -0800

----------------------------------------------------------------------
 src/slave/containerizer/mesos/io/switchboard.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/9db04150/src/slave/containerizer/mesos/io/switchboard.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp
index 89dd498..777918a 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -320,7 +320,12 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare(
     return ContainerLaunchInfo();
   }
 
-#ifndef __WINDOWS__
+#ifdef __WINDOWS__
+  // NOTE: On Windows, both return values of
+  // `IOSwitchboard::requiresServer(containerConfig)` are checked and will
+  // return before reaching here.
+  UNREACHABLE();
+#else
   // First make sure that we haven't already spawned an io
   // switchboard server for this container.
   if (infos.contains(containerId)) {