diff --git a/cluster/scripts/node-backup.sh b/cluster/scripts/node-backup.sh index 4231e1aa6c..647a37c8e3 100755 --- a/cluster/scripts/node-backup.sh +++ b/cluster/scripts/node-backup.sh @@ -11,7 +11,6 @@ source "${TOOLS_LIB}/libcli.source" source "${SPLICE_ROOT}/cluster/scripts/utils.source" RUN_ID=$(date +%s) -WAIT_FOR_BACKUP_RETRIES=450 ##### PVC Backup & Restore @@ -55,7 +54,7 @@ function wait_for_pvc_backup() { _info "Backup of $description PVC ready!" break else - (( i++ )) && (( i > WAIT_FOR_BACKUP_RETRIES )) && { + (( i++ )) && (( i > 300 )) && { # remove the finalizers to allow fully deleting them kubectl patch -n "$namespace" volumesnapshot "$pvc_name" -p '{"metadata":{"finalizers": []}}' --type=merge kubectl delete volumesnapshot -n "$namespace" "$backupName"; @@ -154,10 +153,7 @@ function wait_for_cloudsql_backup() { _info "Backup of $description ready! Backup ID: $id " break else - (( i++ ))&& (( i > WAIT_FOR_BACKUP_RETRIES )) && { - # gcloud sql backups delete "$id" --instance "$db_id" --quiet; - _error "Timed out waiting for backup of $description db"; - } + (( i++ ))&& (( i > 300 )) &&_error "Timed out waiting for backup of $description db" sleep 5 _info "still waiting..." fi