Skip to content

Use post_bbr_healthcheck_timeout_in_seconds for backup and restore #235

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

Merged
merged 2 commits into from
Apr 4, 2022
Merged

Use post_bbr_healthcheck_timeout_in_seconds for backup and restore #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ad62f
Use api_post_start_healthcheck_timeout_in_seconds for backup and restore
moleske Mar 31, 2022
0e9234f
Use new property for post back and restore healthcheck timeout
moleske Mar 31, 2022
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 jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,10 @@ properties:
default: 60
description: "Maximum time (in seconds) for cloud_controller_ng to report healthy"

cc.post_bbr_healthcheck_timeout_in_seconds:
default: 60
description: "Maximum time (in seconds) for cloud_controller_ng to report healthy in backup and restore unlock"

cc.api_health_check_timeout_per_retry:
default: 2
description: "Maximum health check timeout (in seconds) for each retry attempt in the Cloud Controller's route registration health check"
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_ng/templates/post-backup-unlock.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source /var/vcap/packages/capi_utils/syslog_utils.sh
fi

monit_start_job cloud_controller_ng
wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> 60
wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> <%= p("cc.post_bbr_healthcheck_timeout_in_seconds") %>
sleep 30

<% (1..(p("cc.jobs.local.number_of_workers"))).each do |index| %>
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_ng/templates/post-restore-unlock.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source /var/vcap/packages/capi_utils/syslog_utils.sh
fi

monit_start_job cloud_controller_ng
wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> 60
wait_for_server_to_become_healthy <%= "localhost:#{p("cc.external_port")}/healthz" %> <%= p("cc.post_bbr_healthcheck_timeout_in_seconds") %>
sleep 30

<% (1..(p("cc.jobs.local.number_of_workers"))).each do |index| %>
Expand Down