sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

ctdb-eventscripts: Make 11.natgw stateful

Browse Source 
IP addresses and routes are only changed if either the NAT gateway
configuration or the NAT gateway master node has changed.  If running
"ip monitor" this will minimise the amount of noise seen.  It should
also be more lightweight at the expense of managing a couple of state
files.

Add a test to check that configuration changes behave correctly.
Tweak the static route result generation code so that the required
output is sorted.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2014-03-26 16:50:59 +11:00 committed by Amitay Isaacs
parent 57a80ebee3
commit 38279d7ec1
6 changed files with 138 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ctdb/config/events.d/11.natgw
View File

@ -9,11 +9,20 @@
export CTDB_BASE=$(cd -P $(dirname "$0") ; dirname "$PWD")
. $CTDB_BASE/functions
service_name=natgw
loadconfig
[ -n "$CTDB_NATGW_NODES" ] || exit 0
export CTDB_NATGW_NODES
ctdb_setup_service_state_dir
natgw_cfg_new="${service_state_dir}/cfg_new"
natgw_cfg_old="${service_state_dir}/cfg_old"
natgw_master_old="${service_state_dir}/master_old"
natgw_check_config ()
{
[ -r "$CTDB_NATGW_NODES" ] || \
@ -31,6 +40,39 @@ natgw_check_config ()
[ -n "$CTDB_NATGW_STATIC_ROUTES" ] || CTDB_NATGW_STATIC_ROUTES="0.0.0.0/0"
}
natgw_write_config ()
{
_f="$1"
cat >"$_f" <<EOF
CTDB_NATGW_NODES="$CTDB_NATGW_NODES"
CTDB_NATGW_PUBLIC_IP="$CTDB_NATGW_PUBLIC_IP"
CTDB_NATGW_PUBLIC_IFACE="$CTDB_NATGW_PUBLIC_IFACE"
CTDB_NATGW_DEFAULT_GATEWAY="$CTDB_NATGW_DEFAULT_GATEWAY"
CTDB_NATGW_PRIVATE_NETWORK="$CTDB_NATGW_PRIVATE_NETWORK"
CTDB_NATGW_STATIC_ROUTES="$CTDB_NATGW_STATIC_ROUTES"
CTDB_NATGW_SLAVE_ONLY="$CTDB_NATGW_SLAVE_ONLY"
EOF
}
natgw_config_has_changed ()
{
natgw_write_config "$natgw_cfg_new"
# Non-existent old returns true, no log message
if [ ! -f "$natgw_cfg_old" ] ; then
return 0
fi
# Handle no change
if cmp "$natgw_cfg_old" "$natgw_cfg_new" >/dev/null 2>&1 ; then
return 1
fi
echo "NAT gateway configuration has changed"
return 0
}
natgw_set_capability ()
{
# Set NATGW capability depending on configuration
@ -41,7 +83,7 @@ natgw_set_capability ()
fi
}
natgw_clear ()
_natgw_clear ()
{
_ip="${CTDB_NATGW_PUBLIC_IP%/*}"
_maskbits="${CTDB_NATGW_PUBLIC_IP#*/}"
@ -62,6 +104,15 @@ natgw_clear ()
iptables -D INPUT -p tcp --syn -d $_ip/32 -j REJECT 2>/dev/null
}
natgw_clear ()
{
if [ -r "$natgw_cfg_old" ] ; then
(. $natgw_cfg_old ; _natgw_clear)
else
_natgw_clear
fi
}
natgw_set_master ()
{
set_proc sys/net/ipv4/ip_forward 1
@ -116,6 +167,24 @@ natgw_ensure_master ()
fi
}
natgw_master_has_changed ()
{
if [ -r "$natgw_master_old" ] ; then
read _old_natgwmaster <"$natgw_master_old"
else
_old_natgwmaster=""
fi
[ "$_old_natgwmaster" != "$natgwmaster" ]
}
natgw_save_state ()
{
echo "$natgwmaster" >"$natgw_master_old"
# Created by natgw_config_has_changed()
mv "$natgw_cfg_new" "$natgw_cfg_old"
}
case "$1" in
setup)
natgw_check_config
@ -144,6 +213,8 @@ case "$1" in
natgw_set_capability
natgw_ensure_master
natgw_config_has_changed || natgw_master_has_changed || exit 0
natgw_clear
if [ "$mypnn" = "$natgwmaster" ]; then
@ -154,6 +225,9 @@ case "$1" in
# flush our route cache
set_proc sys/net/ipv4/route/flush 1
# Only update saved state when NATGW successfully updated
natgw_save_state
;;
shutdown|removenatgw)

4
ctdb/tests/eventscripts/11.natgw.015.sh
View File

@ -33,7 +33,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ok_null
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok "default via ${FAKE_CTDB_NATGW_MASTER} dev ethXXX metric 10 "
@ -51,7 +51,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ok_null
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok "default via ${CTDB_NATGW_DEFAULT_GATEWAY} dev ethXXX metric 10 "

4
ctdb/tests/eventscripts/11.natgw.025.sh
View File

@ -35,7 +35,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ok_null
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok_natgw_slave_static_routes
@ -53,7 +53,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ok_null
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok_natgw_master_static_routes

56
ctdb/tests/eventscripts/11.natgw.031.sh Executable file
View File

@ -0,0 +1,56 @@
#!/bin/sh
. "${TEST_SCRIPTS_DIR}/unit.sh"
define_test "master node, static routes, custom gateway, config change"
setup_ctdb
export CTDB_NATGW_STATIC_ROUTES="10.1.1.0/24 10.1.2.0/24@10.1.1.253"
echo "##################################################"
echo "Static routes..."
setup_ctdb_natgw <<EOF
192.168.1.21 master
192.168.1.22
192.168.1.23
192.168.1.24
EOF
ok_null
simple_test_event "ipreallocated"
ok_natgw_master_static_routes
simple_test_command ip route show
ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"
echo "##################################################"
echo "Default routes..."
unset CTDB_NATGW_STATIC_ROUTES
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok "default via ${CTDB_NATGW_DEFAULT_GATEWAY} dev ethXXX metric 10 "
simple_test_command ip route show
ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"
echo "##################################################"
echo "Static routes again..."
export CTDB_NATGW_STATIC_ROUTES="10.1.3.0/24 10.1.4.4/32 10.1.2.0/24@10.1.1.252"
ok "NAT gateway configuration has changed"
simple_test_event "ipreallocated"
ok_natgw_master_static_routes
simple_test_command ip route show
ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"

2
ctdb/tests/eventscripts/scripts/local.sh
View File

@ -675,6 +675,7 @@ ok_natgw_master_static_routes ()
_t="${_t}${_t:+${_nl}}"
_t="${_t}${_net} via ${_gw} dev ethXXX metric 10 "
done
_t=$(echo "$_t" | sort)
ok "$_t"
}
@ -694,6 +695,7 @@ ok_natgw_slave_static_routes ()
_t="${_t}${_t:+${_nl}}"
_t="${_t}${_net} via ${FAKE_CTDB_NATGW_MASTER} dev ethXXX metric 10 "
done
_t=$(echo "$_t" | sort)
ok "$_t"
}

2
ctdb/tests/eventscripts/stubs/ip
View File

@ -479,7 +479,7 @@ ip_route_show ()
ip_route_common "$@"
# Missing file is just an empty table
cat "$FAKE_IP_STATE/routes/${_table}" 2>/dev/null || true
sort "$FAKE_IP_STATE/routes/${_table}" 2>/dev/null || true
}
ip_route_flush ()