Skip to content

Make container_metadata_file_check_timeout on silk-shutdown configurable #111

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 1 commit into from
Mar 1, 2024
Merged

Make container_metadata_file_check_timeout on silk-shutdown configurable #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/silk-daemon/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ properties:
description: "Host port used for receiving VXLAN packets"
default: 4789

container_metadata_file_check_timeout:
description: "Timeout in seconds for checking the container metadata file during drain"
default: 600

partition_tolerance_hours:
description: "When silk controller is unavailable, silk daemon will remain healthy and allow creation of new containers for this number of hours. Should be no larger than cf_networking.subnet_lease_expiration_hours."
default: 168
Expand Down
2 changes: 2 additions & 0 deletions jobs/silk-daemon/templates/drain.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ LOGFILE="${LOG_DIR}"/drain.log
SILK_DAEMON_HEALTH_CHECK_ADDRESS=localhost:<%= p("listen_port") %>
LOG_FORMAT=<%= p("logging.format.timestamp") %>
DATASTORE=/var/vcap/data/container-metadata/store.json
CHECK_TIMEOUT=<%= p("container_metadata_file_check_timeout") %>
export PIDFILE=/var/vcap/sys/run/bpm/silk-daemon/silk-daemon.pid

mkdir -p "${LOG_DIR}"
Expand All @@ -27,6 +28,7 @@ run_teardown() {
shutdown_silk_daemon() {
/var/vcap/packages/silk-daemon/bin/silk-daemon-shutdown \
--containerMetadataFile "${DATASTORE}" \
--containerMetadataFileCheckTimeout ${CHECK_TIMEOUT} \
--silkDaemonUrl "http://${SILK_DAEMON_HEALTH_CHECK_ADDRESS}/ping" \
--silkDaemonPidPath "${PIDFILE}" \
--iptablesLockFile "/var/vcap/data/garden-cni/iptables.lock"
Expand Down