You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/11/10 23:20:21 UTC

[3/3] mesos git commit: Windows: Fixed provisioner copy backend build error.

Windows: Fixed provisioner copy backend build error.

The provisioner's `copy` backend has never been supported on Windows,
but we have included it in the build to reduce the number of `#ifdef`s
needed to compile the agent.  If the user attempts to specify a rootfs
on Windows, it will still fail in the containerizer's validation logic.

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


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

Branch: refs/heads/master
Commit: a44dd6b77d2c2631f8707ab34d5b08676ccc1b38
Parents: 28d9181
Author: Joseph Wu <jo...@apache.org>
Authored: Wed Nov 9 13:54:39 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Thu Nov 10 15:20:10 2016 -0800

----------------------------------------------------------------------
 src/slave/containerizer/mesos/provisioner/backends/copy.cpp | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a44dd6b7/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
index 7e98110..0ce3e1e 100644
--- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
@@ -131,6 +131,7 @@ Future<Nothing> CopyBackendProcess::_provision(
     string layer,
     const string& rootfs)
 {
+#ifndef __WINDOWS__
   // Traverse the layer to check if there is any whiteout files, if
   // yes, remove the corresponding files/directories from the rootfs.
   // Note: We assume all image types use AUFS whiteout format.
@@ -265,6 +266,10 @@ Future<Nothing> CopyBackendProcess::_provision(
 
       return Nothing();
     });
+#else
+  return Failure(
+      "Provisioning a rootfs from an image is not supported on Windows");
+#endif // __WINDOWS__
 }