]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: also retry on digest mismatch
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 13:11:46 +0000 (15:11 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 13:20:10 +0000 (15:20 +0200)
Fixes: https://tracker.ceph.com/issues/46534
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ea080e669a83bc2f7478587ef5f4c6a658738a62)

src/cephadm/cephadm

index 2029b8acdf7efe8fc802ca9a38f023f87a2bbb6a..51667d3bae801b284ebb983e7044d177bc535b50 100755 (executable)
@@ -2395,12 +2395,13 @@ def command_pull():
 
 
 def _pull_image(image):
-    # type: () -> None
+    # type: (str) -> None
     logger.info('Pulling container image %s...' % image)
 
     ignorelist = [
         "error creating read-write layer with ID",
         "net/http: TLS handshake timeout",
+        "Digest did not match, expected",
     ]
 
     cmd = [container_path, 'pull', image]