sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-23 06:50:21 +03:00
Code

Eventscripts - make 13.per_ip_routing fail gracefully if config is missing

Browse Source 
Currently it spews out random messages about the file being missing.

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

(This used to be ctdb commit 351ca413eec460330571ca8b01ad269728fe15df)
This commit is contained in:
Martin Schwenke 2012-03-20 16:23:24 +11:00
parent ac973b34df
commit 2f5cb56017
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,6 +166,7 @@ clean_up_table_ids ()
# This prints the config for an IP, which is either relevant entries
# from the config file or, if set to the magic link local value, some
# link local routing config for the IP.
# NOTE: non-zero return indicates missing configuration file
get_config_for_ip ()
{
_ip="$1"
@ -179,6 +180,8 @@ get_config_for_ip ()
fi
done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE:-/dev/null}${CTDB:+/public_addresses}}"
else
[ -f "$CTDB_PER_IP_ROUTING_CONF" ] || return 1
while read _i _rest ; do
if [ "$_ip" = "$_i" ] ; then
printf "%s\t%s\n" "$_ip" "$_rest"
@ -191,7 +194,9 @@ ip_has_configuration ()
{
_ip="$1"
[ -n "$(get_config_for_ip $_ip)" ]
_config="$(get_config_for_ip $_ip)" || \
die "error: CTDB_PER_IP_ROUTING_CONF=$CTDB_PER_IP_ROUTING_CONF file not found"
[ -n "$_config" ]
}
add_routing_for_ip ()
@ -273,7 +278,7 @@ add_missing_routes ()
add_routing_for_ip "$_iface" "$_ip"
fi
done
}
} || exit $?
}
######################################################################