mesos git commit: Added docker runtime isolator check if image providers include docker.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 4194e395d -> c7dea5888


Added docker runtime isolator check if image providers include docker.

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


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

Branch: refs/heads/master
Commit: c7dea5888b4f5194e7d1c6abe0f379ab229e3039
Parents: 4194e39
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Mar 1 13:15:23 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 1 13:15:23 2016 -0800

----------------------------------------------------------------------
 src/slave/containerizer/mesos/provisioner/store.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c7dea588/src/slave/containerizer/mesos/provisioner/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/store.cpp b/src/slave/containerizer/mesos/provisioner/store.cpp
index 40bc00c..8324269 100644
--- a/src/slave/containerizer/mesos/provisioner/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/store.cpp
@@ -69,6 +69,14 @@ Try<hashmap<Image::Type, Owned<Store>>> Store::create(const Flags& flags)
     stores.put(imageType, store.get());
   }
 
+  if (stores.contains(Image::DOCKER) &&
+      !strings::contains(flags.isolation, "docker/runtime")) {
+    EXIT(1)
+      << "Docker runtime isolator has to be specified if 'DOCKER' is included "
+      << "in 'image_providers'. Please add 'docker/runtime' to '--isolation' "
+      << "flags";
+  }
+
   return stores;
 }