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/03/03 22:20:38 UTC
mesos git commit: Added check for Appc image's dependency id.
Repository: mesos
Updated Branches:
refs/heads/master 01a4d0bd5 -> 954fc08ff
Added check for Appc image's dependency id.
Since dependency's image id is an optional field, we need to check for
its existence before using it for fetching an image.
Review: https://reviews.apache.org/r/44357/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/954fc08f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/954fc08f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/954fc08f
Branch: refs/heads/master
Commit: 954fc08ff7fb2384e1a065d95285c15af1efbe6f
Parents: 01a4d0b
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Thu Mar 3 13:20:25 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Mar 3 13:20:25 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/appc/store.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/954fc08f/src/slave/containerizer/mesos/provisioner/appc/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/appc/store.cpp b/src/slave/containerizer/mesos/provisioner/appc/store.cpp
index 1e893da..33e97fc 100644
--- a/src/slave/containerizer/mesos/provisioner/appc/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/appc/store.cpp
@@ -317,7 +317,9 @@ Future<vector<string>> StoreProcess::fetchDependencies(const string& imageId)
manifest->dependencies()) {
Image::Appc appc;
appc.set_name(dependency.imagename());
- appc.set_id(dependency.imageid());
+ if (dependency.has_imageid()) {
+ appc.set_id(dependency.imageid());
+ }
// TODO(jojy): Make Image::Appc use appc::spec::Label instead of
// mesos::Label so that we can avoid this loop here.