Catch additional retry on docker image pull

- Partially addresses #341
Azure · Mar 6, 2020 · 2cfc07d · 2cfc07d
1 parent 2291051
commit 2cfc07d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scripts/shipyard_nodeprep.sh b/scripts/shipyard_nodeprep.sh
@@ -960,7 +960,9 @@ docker_pull_image_fallback() {
         uhs=$(grep -i 'received unexpected HTTP status' <<<"$pull_out")
         local tht
         tht=$(grep -i 'TLS handshake timeout' <<<"$pull_out")
-        if [[ -n "$tmr" ]] || [[ -n "$crbp" ]] || [[ -n "$epic" ]] || [[ -n "$erb" ]] || [[ -n "$uhs" ]] || [[ -n "$tht" ]]; then
+        local rcc
+        rcc=$(grep -i 'request canceled while waiting for connection' <<<"$pull_out")
+        if [[ -n "$tmr" ]] || [[ -n "$crbp" ]] || [[ -n "$epic" ]] || [[ -n "$erb" ]] || [[ -n "$uhs" ]] || [[ -n "$tht" ]] || [[ -n "$rcc" ]]; then
             log WARNING "will retry: $pull_out"
         else
             log ERROR "$pull_out"
@@ -1011,7 +1013,9 @@ docker_pull_image() {
         uhs=$(grep -i 'received unexpected HTTP status' <<<"$pull_out")
         local tht
         tht=$(grep -i 'TLS handshake timeout' <<<"$pull_out")
-        if [[ -n "$tmr" ]] || [[ -n "$crbp" ]] || [[ -n "$epic" ]] || [[ -n "$erb" ]] || [[ -n "$uhs" ]] || [[ -n "$tht" ]]; then
+        local rcc
+        rcc=$(grep -i 'request canceled while waiting for connection' <<<"$pull_out")
+        if [[ -n "$tmr" ]] || [[ -n "$crbp" ]] || [[ -n "$epic" ]] || [[ -n "$erb" ]] || [[ -n "$uhs" ]] || [[ -n "$tht" ]] || [[ -n "$rcc" ]]; then
             log WARNING "will retry: $pull_out"
         else
             log ERROR "$pull_out"