Skip to content

[202012] Fix race condition between networking service and interface-config service #10766

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
qiluo-msft merged 4 commits into from
May 14, 2022
Merged

[202012] Fix race condition between networking service and interface-config service #10766

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f31c0
Fix race condition between networking service and interface-config se…
Junchao-Mellanox May 5, 2022
cf1787a
Merge branch '202012' into cp-fix-race-cond
yxieca May 6, 2022
d342ddd
Merge branch '202012' into cp-fix-race-cond
qiluo-msft May 10, 2022
90452ac
Merge branch '202012' into cp-fix-race-cond
liat-grozovik May 14, 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
38 changes: 32 additions & 6 deletions files/image_config/interfaces/interfaces-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,39 @@
#!/bin/bash

ifdown --force eth0
function wait_networking_service_done() {
local -i _WDOG_CNT="1"
local -ir _WDOG_MAX="30"

local -r _TIMEOUT="1s"

while [[ "${_WDOG_CNT}" -le "${_WDOG_MAX}" ]]; do
networking_status="$(systemctl is-active networking 2>&1)"

if [[ "${networking_status}" == active || "${networking_status}" == inactive || "${networking_status}" == failed ]] ; then
return
fi

echo "interfaces-config: networking service is running, wait for it done"

let "_WDOG_CNT++"
sleep "${_TIMEOUT}"
done

echo "interfaces-config: networking service is still running after 30 seconds, killing it"
systemctl kill networking 2>&1
}

if [[ $(ifquery --running eth0) ]]; then
wait_networking_service_done
ifdown --force eth0
fi

# Check if ZTP DHCP policy has been installed
if [ -e /etc/network/ifupdown2/policy.d/ztp_dhcp.json ]; then
if [[ -e /etc/network/ifupdown2/policy.d/ztp_dhcp.json ]]; then
# Obtain port operational state information
redis-dump -d 0 -k "PORT_TABLE:Ethernet*" -y > /tmp/ztp_port_data.json

if [ $? -ne 0 ] || [ ! -e /tmp/ztp_port_data.json ] || [ "$(cat /tmp/ztp_port_data.json)" = "" ]; then
if [[ $? -ne 0 || ! -e /tmp/ztp_port_data.json || "$(cat /tmp/ztp_port_data.json)" = "" ]]; then
echo "{}" > /tmp/ztp_port_data.json
fi

Expand All @@ -27,11 +53,11 @@ CFGGEN_PARAMS=" \
"
sonic-cfggen $CFGGEN_PARAMS

[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
[ -f /var/run/dhclient6.eth0.pid ] && kill `cat /var/run/dhclient6.eth0.pid` && rm -f /var/run/dhclient6.eth0.pid
[[ -f /var/run/dhclient.eth0.pid ]] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
[[ -f /var/run/dhclient6.eth0.pid ]] && kill `cat /var/run/dhclient6.eth0.pid` && rm -f /var/run/dhclient6.eth0.pid

for intf_pid in $(ls -1 /var/run/dhclient*.Ethernet*.pid 2> /dev/null); do
[ -f ${intf_pid} ] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
[[ -f ${intf_pid} ]] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
done

# Read sysctl conf files again
Expand Down