Skip to content

Commit 2043f29

Browse files
Merge pull request #2923 from manish-jangra/fix/ovn-acl-logging-startup-race-condition
KONFLUX-11591: Fix ovn-acl-logging CrashLoopBackOff due to startup race condition
2 parents d2bd842 + 67f31ae commit 2043f29

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

bindata/network/ovn-kubernetes/common/008-script-lib.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,14 @@ data:
125125
MAXLOGFILES="{{.OVNPolicyAuditMaxLogFiles}}"
126126
LOGDIR=$(dirname ${controller_logfile})
127127
128-
# wait a bit for ovn-controller to start
128+
# wait for ovn-controller to start and write its PID file
129129
local retries=0
130+
CONTROLLERPID=""
130131
while [[ 30 -gt "${retries}" ]]; do
131132
(( retries += 1 ))
132-
CONTROLLERPID=$(cat ${controller_pidfile})
133+
if [[ -f "${controller_pidfile}" ]]; then
134+
CONTROLLERPID=$(cat "${controller_pidfile}" 2>/dev/null || true)
135+
fi
133136
if [[ -n "${CONTROLLERPID}" ]]; then
134137
break
135138
fi

0 commit comments

Comments
 (0)