[airflow] branch master updated: More verbose and less frequent image poll (#13555)

[po...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 992ac34  More verbose and less frequent image poll (#13555)
992ac34 is described below

commit 992ac34ef359e01c4f3827e5363ddbe463434799
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Fri Jan 8 00:54:19 2021 +0100

    More verbose and less frequent image poll (#13555)
    
    I noticed that in a number of cases the image poll in waiting for
    CI images takes a realy long time and appears to be hanging.
    
    In order to investigated the root cause of this this PR increases
    the verbosity of that step by adding "Still waiting" in
    every loop as well as prints output of the potentially failed
    curl command.
---
 .github/workflows/ci.yml                         | 4 ++--
 scripts/ci/libraries/_push_pull_remove_images.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 637f39c..279c872 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -186,7 +186,7 @@ jobs:
         if: needs.build-info.outputs.waitForImage == 'true'
       - name: >
           Wait for CI images
-          ${{ needs.build-info.outputs.pythonVersions }}:${{ env.GITHUB_REGISTRY_PULL_IMAGE_TAG }}"
+          ${{ needs.build-info.outputs.pythonVersions }}:${{ env.GITHUB_REGISTRY_PULL_IMAGE_TAG }}
         env:
           CURRENT_PYTHON_MAJOR_MINOR_VERSIONS_AS_STRING: >
             ${{needs.build-info.outputs.pythonVersionsListAsString}}
@@ -856,7 +856,7 @@ jobs:
         if: needs.build-info.outputs.waitForImage == 'true'
       - name: >
           Wait for PROD images
-          ${{ needs.build-info.outputs.pythonVersions }}:${{ env.GITHUB_REGISTRY_PULL_IMAGE_TAG }}"
+          ${{ needs.build-info.outputs.pythonVersions }}:${{ env.GITHUB_REGISTRY_PULL_IMAGE_TAG }}
         env:
           CURRENT_PYTHON_MAJOR_MINOR_VERSIONS_AS_STRING: >
             ${{needs.build-info.outputs.pythonVersionsListAsString}}
diff --git a/scripts/ci/libraries/_push_pull_remove_images.sh b/scripts/ci/libraries/_push_pull_remove_images.sh
index da0a077..0f88828 100644
--- a/scripts/ci/libraries/_push_pull_remove_images.sh
+++ b/scripts/ci/libraries/_push_pull_remove_images.sh
@@ -283,12 +283,14 @@ function push_pull_remove_images::wait_for_github_registry_image() {
             -X GET "${GITHUB_API_CALL}" -u "${GITHUB_USERNAME}:${GITHUB_TOKEN}" 2>/dev/null > "${OUTPUT_LOG}"
         local digest
         digest=$(jq '.config.digest' < "${OUTPUT_LOG}")
-        echo -n "."
         if [[ ${digest} != "null" ]]; then
             echo  "${COLOR_GREEN_OK}  ${COLOR_RESET}"
             break
+        else
+            echo "${COLOR_YELLOW}Still waiting!${COLOR_RESET}"
+            cat "${OUTPUT_LOG}"
         fi
-        sleep 10
+        sleep 60
     done
     verbosity::print_info "Found ${image_name_in_github_registry}:${image_tag_in_github_registry} image"
     verbosity::print_info "Digest: '${digest}'"