Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding logic to poll deployment health instead of static wait #1240

Merged
merged 7 commits into from
Jul 12, 2023
Merged

Adding logic to poll deployment health instead of static wait #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d471156
adding deployment health check
vatsrahul1001 Jul 12, 2023
b23c2cc
passing var for KE as well
vatsrahul1001 Jul 12, 2023
7a5d1be
fixing pre-commit
vatsrahul1001 Jul 12, 2023
9dbcdfb
fixing var name
vatsrahul1001 Jul 12, 2023
5f39bd9
fixing invalid syntax
vatsrahul1001 Jul 12, 2023
0fc1ed0
formatting fix
vatsrahul1001 Jul 12, 2023
189c2d4
update polling time to 1800
vatsrahul1001 Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/deploy-integration-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
deployment_id: ${{ secrets.PROVIDER_INTEGRATION_TESTS_DEPLOYMENT_ID }}
astronomer_key_id: ${{ secrets.PROVIDER_INTEGRATION_TESTS_ASTRONOMER_KEY_ID }}
astronomer_key_secret: ${{ secrets.PROVIDER_INTEGRATION_TESTS_ASTRONOMER_KEY_SECRET }}
organization_id: ${{ secrets.ORGANIZATION_ID }}
bearer_token: ${{ secrets.BEARER_TOKEN }}

deploy-to-providers-integration-tests-on-KE:
if: |
Expand Down Expand Up @@ -88,3 +90,5 @@ jobs:
deployment_id: ${{ secrets.PROVIDER_INTEGRATION_TESTS_ON_KE_DEPLOYMENT_ID }}
astronomer_key_id: ${{ secrets.PROVIDER_INTEGRATION_TESTS_ON_KE_ASTRONOMER_KEY_ID }}
astronomer_key_secret: ${{ secrets. PROVIDER_INTEGRATION_TESTS_ON_KE_ASTRONOMER_KEY_SECRET }}
organization_id: ${{ secrets.ORGANIZATION_ID }}
bearer_token: ${{ secrets.BEARER_TOKEN }}
40 changes: 30 additions & 10 deletions .github/workflows/trigger-dag-reuse-wf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ on: # yamllint disable-line rule:truthy
required: false
type: string
default: ''
wait_time:
description: 'seconds to wait (default 1800 seconds = 30 minutes)'
required: false
type: number
default: 1800
dags_to_trigger_after_deployment:
description: |
Comma separated list of dag_ids to trigger after deployment
Expand All @@ -34,17 +29,42 @@ on: # yamllint disable-line rule:truthy
astronomer_key_secret:
description: 'astro cloud astronomer_key_secret'
required: true
organization_id:
description: 'astro cloud organization_id'
required: true
bearer_token:
description: 'workspace bearer token'
required: true

jobs:
wait-for-deployment-to-be-ready-and-trigger-dag:
runs-on: 'ubuntu-20.04'
steps:
- name: Sleep and wait for astro cloud deployment

- name: Wait for deployment to be healthy
run: |
echo "Current timestamp is" `date`
echo "Sleeping for ${{ inputs.wait_time }}"
echo "allowing the deployed image to be updated across all Airflow components."
sleep ${{ inputs.wait_time }}
astro_core_api="https://api.astronomer.io/v1alpha1/organizations/${{secrets.organization_id }}/\
deployments"
tries=15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might make sense to wait for an hour maybe in some scenarios where it might take longer. So tries=30?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or the previous one would have been fine too. 60 * 60

health_flag=false

while [[ $tries -gt 0 && $health_flag == false ]]; do
sleep 120
Copy link
Collaborator

@pankajkoti pankajkoti Jul 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think would be good to place this log at the end of the while loop, just to see logs saying Deployment status is different than Healthy and it's waiting for deployment to be healthy in case it becomes healthy in <2 mins.

response=$(curl -s -H "Authorization: Bearer ${{ secrets.bearer_token }}" -X GET \
"$astro_core_api?deploymentIds=${{ secrets.deployment_id }}")
deployment_status=$(echo "$response" | jq -r '.deployments[0].status')
echo "Deployment status is: $deployment_status"
echo "Waiting for deployment to be in ready state!!!"
if [[ $deployment_status == "HEALTHY" ]]; then
health_flag=true
fi
tries=$((tries - 1))
done
if [[ $health_flag == false ]]; then
echo "Timed out waiting for deployment ${{ secrets.deployment_id }} to be HEALTHY"
exit 1
fi
echo "${{ secrets.deployment_id }} is in HEALTHY state now"

- name: Checkout
uses: actions/checkout@v3
Expand Down