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: 00.ctdb uses $service_state_dir, neaten update_config_from_tdb().

Browse Source 
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)
This commit is contained in:
Martin Schwenke 2010-12-17 16:21:53 +11:00
parent cbf030a72e
commit dd56cde3ff
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ctdb/config/events.d/00.ctdb
View File

@ -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