From c8630deb6e89d1145a38bd8aa8adf855aa7b19ec Mon Sep 17 00:00:00 2001
From: i583051 <k.lapkov@sap.com>
Date: Fri, 1 Mar 2024 10:40:57 +0200
Subject: [PATCH] Add property for check-timeout

---
 jobs/silk-daemon/spec                | 4 ++++
 jobs/silk-daemon/templates/drain.erb | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/jobs/silk-daemon/spec b/jobs/silk-daemon/spec
index 70be43f2f..7a1525b3c 100644
--- a/jobs/silk-daemon/spec
+++ b/jobs/silk-daemon/spec
@@ -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
diff --git a/jobs/silk-daemon/templates/drain.erb b/jobs/silk-daemon/templates/drain.erb
index 6ff8b3f8a..c3cbe3833 100644
--- a/jobs/silk-daemon/templates/drain.erb
+++ b/jobs/silk-daemon/templates/drain.erb
@@ -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}"
@@ -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"