Sync logic should not assume on schema1 by default existence.

closes #3286 https://pulp.plan.io/issues/3286
pulp · Feb 14, 2018 · eba6378 · eba6378
1 parent 338e879
commit eba6378
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/plugins/pulp_docker/plugins/importers/sync.py b/plugins/pulp_docker/plugins/importers/sync.py
@@ -273,10 +273,16 @@ def _process_manifest_list(self, manifest_list, digest, available_blobs, tag):
             manifest, digest, _ = manifests[0]
             self._process_manifest(manifest, digest, available_blobs, tag=None)
         if manifest_list.amd64_digest and manifest_list.amd64_schema_version == 2:
-            # we set the headers to False in order to get the conversion to schema1
-            manifests = self.parent.index_repository.get_manifest(tag, headers=False, tag=True)
-            manifest, digest, _ = manifests[0]
-            self._process_manifest(manifest, digest, available_blobs, tag=tag)
+            try:
+                # for compatibility with older clients, try to fetch schema1 in case it is available
+                # we set the headers to False in order to get the conversion to schema1
+                manifests = self.parent.index_repository.get_manifest(tag, headers=False, tag=True)
+                manifest, digest, _ = manifests[0]
+                self._process_manifest(manifest, digest, available_blobs, tag=tag)
+            except IOError as e:
+                if str(e) != 'Not Found':
+                    raise
+                pass
         # Remember this tag for the SaveTagsStep.
         self.parent.save_tags_step.tagged_manifests.append((tag, manifest_list,
                                                             constants.MANIFEST_LIST_TYPE))

diff --git a/plugins/pulp_docker/plugins/registry.py b/plugins/pulp_docker/plugins/registry.py
@@ -402,11 +402,17 @@ def get_manifest(self, reference, headers=True, tag=True):
         # if it is schema2 we need to ask schema1 for older clients.
         if tag and response_headers.get(content_type_header) == constants.MEDIATYPE_MANIFEST_S2:
             request_headers['Accept'] = constants.MEDIATYPE_MANIFEST_S1
-            response_headers, manifest = self._get_path(path, headers=request_headers)
-            digest = self._digest_check(response_headers, manifest)
-
-            # add manifest and digest
-            manifests.append((manifest, digest, response_headers.get(content_type_header)))
+            try:
+                # for compatibility with older clients, try to fetch schema1 in case it is available
+                response_headers, manifest = self._get_path(path, headers=request_headers)
+                digest = self._digest_check(response_headers, manifest)
+
+                # add manifest and digest
+                manifests.append((manifest, digest, response_headers.get(content_type_header)))
+            except IOError as e:
+                if str(e) != 'Not Found':
+                    raise
+                pass
 
         # returned list will be whether:
         # [(S2, digest, content_type), (S1, digest, content_type)]