Skip to content
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

Convert arp_update into a 'start-it-once' mode #1864

Merged
merged 7 commits into from
Jul 18, 2018
Merged

Convert arp_update into a 'start-it-once' mode #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eacbb7
sonic-quagga update. Don't spam with 'Vtysh connected from' message
pavel-shirshov Jun 26, 2018
177c802
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 29, 2018
bcfff2c
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 30, 2018
6f78573
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 6, 2018
5475002
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 11, 2018
3fa82bb
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 16, 2018
0abb9a0
Run arp_update just once, don't restart it. It will run continuosly w…
pavel-shirshov Jul 16, 2018
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: 2 additions & 2 deletions dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:arp_update]
command=bash -c "/usr/bin/arp_update; sleep 300"
command=/usr/bin/arp_update
priority=8
autostart=false
autorestart=true
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog

Expand Down
21 changes: 12 additions & 9 deletions files/scripts/arp_update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
# arp_update: Send gratuitous ARP requests to VLAN member neighbors to refresh
# the neighbors state.

VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
for vlan in $VLAN; do
# generate a list of arping commands:
# arping -q -w 0 -c 1 -i <VLAN interface> <IP 1>;
# arping -q -w 0 -c 1 -i <VLAN interface> <IP 2>;
# ...
arpingcmd="sed -e 's/ / -i /' -e 's/^/arping -q -w 0 -c 1 /' -e 's/$/;/'"
ipcmd="ip -4 neigh show | grep $vlan | cut -d ' ' -f 1,3 | $arpingcmd"
while /bin/true; do
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
for vlan in $VLAN; do
# generate a list of arping commands:
# arping -q -w 0 -c 1 -i <VLAN interface> <IP 1>;
# arping -q -w 0 -c 1 -i <VLAN interface> <IP 2>;
# ...
arpingcmd="sed -e 's/ / -i /' -e 's/^/arping -q -w 0 -c 1 /' -e 's/$/;/'"
ipcmd="ip -4 neigh show | grep $vlan | cut -d ' ' -f 1,3 | $arpingcmd"

eval `eval $ipcmd`
eval `eval $ipcmd`
done
sleep 300
done
4 changes: 2 additions & 2 deletions platform/p4/docker-sonic-p4/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:arp_update]
command=bash -c "/usr/bin/arp_update; sleep 300"
command=/usr/bin/arp_update
priority=15
autostart=false
autorestart=true
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
4 changes: 2 additions & 2 deletions platform/vs/docker-sonic-vs/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:arp_update]
command=bash -c "/usr/bin/arp_update; sleep 300"
command=/usr/bin/arp_update
priority=15
autostart=false
autorestart=true
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog

Expand Down