From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 14 Jul 2020 13:11:46 +0000 (+0200)
Subject: cephadm: also retry on digest mismatch
X-Git-Tag: v15.2.5~105^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d30de70f716d6a7ddc21d7cf5082b852bb74eb2f;p=ceph.git

cephadm: also retry on digest mismatch

Fixes: https://tracker.ceph.com/issues/46534
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ea080e669a83bc2f7478587ef5f4c6a658738a62)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2029b8acdf7e..51667d3bae80 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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]