[mesos] 03/03: Supported docker manifest v2s2 config with image GC.

[gi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gilbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit cd75916020080232a27df4597f9de4dc2dc961d9
Author: Gilbert Song <so...@gmail.com>
AuthorDate: Mon Apr 15 21:47:10 2019 -0700

    Supported docker manifest v2s2 config with image GC.
    
    After the docker manifest v2 schema2 support, the manifest config
    is saved as a layer in image store. However, the config file
    cannot survive if the image GC is triggered.
    
    This patch supports checkpointing the config path in provisioner,
    so that the provisioner has the information of configs so that
    they will not be deleted during GC.
---
 .../mesos/provisioner/docker/metadata_manager.cpp            |  4 ++++
 src/slave/containerizer/mesos/provisioner/docker/store.cpp   |  4 ++++
 src/slave/containerizer/mesos/provisioner/provisioner.cpp    | 12 ++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp b/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
index 53de625..db3eaa8 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
@@ -201,6 +201,10 @@ Future<hashset<string>> MetadataManagerProcess::prune(
     foreach (const string& layerId, image->layer_ids()) {
       retainedLayers.insert(layerId);
     }
+
+    if (image->has_config_digest()) {
+      retainedLayers.insert(image->config_digest());
+    }
   }
 
   storedImages = std::move(retainedImages);
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index 36b2c7d..286ee5f 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -431,6 +431,10 @@ Future<ImageInfo> StoreProcess::__get(
         v1.error());
   }
 
+  if (image.has_config_digest()) {
+    return ImageInfo{layerPaths, v1.get(), None(), configPath};
+  }
+
   return ImageInfo{layerPaths, v1.get()};
 }
 
diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.cpp b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
index ac402fb..9b0ea38 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
@@ -441,6 +441,10 @@ Future<Nothing> ProvisionerProcess::recover(
             layers->paths().begin(),
             layers->paths().end(),
             std::back_inserter(info->layers.get()));
+
+        if (layers->has_config()) {
+          info->layers->push_back(layers->config());
+        }
       }
     }
 
@@ -555,6 +559,10 @@ Future<ProvisionInfo> ProvisionerProcess::_provision(
   infos[containerId]->rootfses[backend].insert(rootfsId);
   infos[containerId]->layers = imageInfo.layers;
 
+  if (imageInfo.config.isSome()) {
+    infos[containerId]->layers->push_back(imageInfo.config.get());
+  }
+
   string backendDir = provisioner::paths::getBackendDir(
       rootDir,
       containerId,
@@ -574,6 +582,10 @@ Future<ProvisionInfo> ProvisionerProcess::_provision(
         containerLayers.add_paths(layer);
       }
 
+      if (imageInfo.config.isSome()) {
+        containerLayers.set_config(imageInfo.config.get());
+      }
+
       Try<Nothing> checkpoint = slave::state::checkpoint(path, containerLayers);
       if (checkpoint.isError()) {
         return Failure(