Skip to content

[dhcp_relay] Properly wait for routed interfaces to be ready before starting relay agent #3441

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
jleveque merged 3 commits into from
Sep 12, 2019
Merged

[dhcp_relay] Properly wait for routed interfaces to be ready before starting relay agent #3441

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e926c0
[dhcp_relay] Properly wait for routed interfaces to be ready before s…
Sep 11, 2019
3f0f136
Add pfx_filter where applicable
Sep 11, 2019
b6ccc3e
Update sonic-cfggen unit test sample output
Sep 11, 2019
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
35 changes: 15 additions & 20 deletions dockers/docker-dhcp-relay/wait_for_intf.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,41 @@

STATE_DB_IDX="6"

PORT_TABLE_PREFIX="PORT_TABLE"
VLAN_TABLE_PREFIX="VLAN_TABLE"
LAG_TABLE_PREFIX="LAG_TABLE"

function wait_until_iface_ready
{
TABLE_PREFIX=$1
IFACE=$2
IFACE_NAME=$1
IFACE_CIDR=$2

echo "Waiting until interface $IFACE is ready..."
echo "Waiting until interface ${IFACE_NAME} is ready..."

# Wait for the interface to come up
# (i.e., interface is present in STATE_DB and state is "ok")
while true; do
RESULT=$(redis-cli -n ${STATE_DB_IDX} HGET "${TABLE_PREFIX}|${IFACE}" "state" 2> /dev/null)
RESULT=$(redis-cli -n ${STATE_DB_IDX} HGET "INTERFACE_TABLE|${IFACE_NAME}|${IFACE_CIDR}" "state" 2> /dev/null)
if [ x"$RESULT" == x"ok" ]; then
break
fi

sleep 1
done

echo "Interface ${IFACE} is ready!"
echo "Interface ${IFACE_NAME} is ready!"
}


# Wait for all interfaces to be up and ready
{% for name in PORT %}
{% if name in INTERFACE %}
wait_until_iface_ready ${PORT_TABLE_PREFIX} {{ name }}
# Wait for all interfaces with IPv4 addresses to be up and ready
{% for (name, prefix) in INTERFACE %}
{% if prefix | ipv4 %}
wait_until_iface_ready {{ name }} {{ prefix }}
{% endif %}
{% endfor %}
{% for name in VLAN %}
{% if name in VLAN_INTERFACE %}
wait_until_iface_ready ${VLAN_TABLE_PREFIX} {{ name }}
{% for (name, prefix) in VLAN_INTERFACE %}
{% if prefix | ipv4 %}
wait_until_iface_ready {{ name }} {{ prefix }}
{% endif %}
{% endfor %}
{% for name in PORTCHANNEL %}
{% if name in PORTCHANNEL_INTERFACE %}
wait_until_iface_ready ${LAG_TABLE_PREFIX} {{ name }}
{% for (name, prefix) in PORTCHANNEL_INTERFACE %}
{% if prefix | ipv4 %}
wait_until_iface_ready {{ name }} {{ prefix }}
{% endif %}
{% endfor %}