diff options
| author | Martin Schwenke <martin@meltin.net> | 2010-12-17 16:21:53 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-09 16:45:50 +1000 |
| commit | dd56cde3ff21cd5cba17d3f81cbf45b3becf900b (patch) | |
| tree | 2899acdb8ed27a6b25602cfda461f0405a8dc60f | |
| parent | cbf030a72efb69756dd722d82fff11067e989377 (diff) | |
| download | samba-dd56cde3ff21cd5cba17d3f81cbf45b3becf900b.tar.gz samba-dd56cde3ff21cd5cba17d3f81cbf45b3becf900b.tar.xz samba-dd56cde3ff21cd5cba17d3f81cbf45b3becf900b.zip | |
Eventscripts: 00.ctdb uses $service_state_dir, neaten update_config_from_tdb().
This also fixes a bug where update_config_from_tdb() used an incorrect
filename in one place.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a5ce2adaa39f077f56582072a97bb64d0eba4b4d)
| -rwxr-xr-x | ctdb/config/events.d/00.ctdb | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb index bf77b9c9a4..2111c23788 100755 --- a/ctdb/config/events.d/00.ctdb +++ b/ctdb/config/events.d/00.ctdb @@ -12,22 +12,27 @@ . $CTDB_BASE/functions loadconfig +ctdb_setup_service_state_dir "ctdb" + +# update_config_from_tdb() { - # Pull optional ctdb configuration data out of config.tdb - PUBLICADDRESSESKEY='public_addresses:node#'`ctdb -t 1 xpnn|sed -e "s/.*://"` - rm -f $CTDB_VARDIR/state/public_addresses - ctdb pfetch config.tdb $PUBLICADDRESSESKEY $CTDB_VARDIR/state/public_addresses 2>/dev/null - [ "$?" = "0" ] && [ `stat --format="%s" /etc/ctdb/state/public_addresses` != "0" ] && [ ! -z "$CTDB_PUBLIC_ADDRESSES" ] && { - diff $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES >/dev/null 2>/dev/null - [ $? = "0" ] || { - echo CTDB public address configuration had been updated. - echo Extracting new configuration from database. - diff $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES - cp $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES - echo Restarting CTDB - service ctdb restart & - } - } + + # Pull optional ctdb configuration data out of config.tdb + _key="public_addresses:node#$(ctdb -t 1 xpnn|sed -e 's/.*://')" + _t="$service_state_dir/public_addresses" + rm -f "$_t" + + if ctdb pfetch config.tdb "$_key" "$_t" 2>/dev/null && \ + [ -s "$_t" -a -n "$CTDB_PUBLIC_ADDRESSES"] && \ + ! cmp -s "$_t" "$CTDB_PUBLIC_ADDRESSES" ; then + + echo "CTDB public address configuration has changed." + echo "Extracting new configuration from database." + diff "$_t" "$CTDB_PUBLIC_ADDRESSES" + cp "$_t" "$CTDB_PUBLIC_ADDRESSES" + echo "Restarting CTDB" + service ctdb restart & + fi } case "$1" in |