sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-26 18:50:30 +03:00
Code

eventscripts: Print a warning on failure to delete a routing rule

Browse Source 
del_routing_for_ip() currently fails silently, which could hide real
errors.

In add_routing_for_ip() we don't want to see any error when calling
del_routing_for_ip(), since we don't expect the rule to be there.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 30d69defa7e97ab5e3ba0492a27868dde2616494)
This commit is contained in:
Martin Schwenke 2012-06-13 13:49:49 +10:00
parent 85cc174b91
commit e1348221d6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ctdb/config/events.d/13.per_ip_routing
View File

@ -217,7 +217,7 @@ add_routing_for_ip ()
_pref="$CTDB_PER_IP_ROUTING_RULE_PREF"
_table_id="${table_id_prefix}${_ip}"
del_routing_for_ip "$_ip"
del_routing_for_ip "$_ip" >/dev/null 2>&1
ip rule add from "$_ip" pref "$_pref" table "$_table_id" || \
die "add_routing_for_ip: failed to add rule for $_ip"
@ -238,9 +238,17 @@ del_routing_for_ip ()
_pref="$CTDB_PER_IP_ROUTING_RULE_PREF"
_table_id="${table_id_prefix}${_ip}"
# Do this unconditionally since we own any matching table ids...
ip rule del from $_ip pref $_pref table $_table_id 2>/dev/null
ip route flush table $_table_id 2>/dev/null
# Do this unconditionally since we own any matching table ids.
# However, print a meaningful message if something goes wrong.
_cmd="ip rule del from $_ip pref $_pref table $_table_id"
_out=$($_cmd 2>&1) || \
cat <<EOF
WARNING: Failed to delete policy routing rule
Command "$_cmd" failed:
$_out
EOF
# This should never fail, so don't redirect output.
ip route flush table $_table_id
}
######################################################################