diff options
| author | Martin Schwenke <martin@meltin.net> | 2010-12-16 08:57:46 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-11 10:46:20 +1000 |
| commit | a35138a0013354c30a65b931f9b4a327c6d95a9c (patch) | |
| tree | 814286d40150458758d17b1c11106f2a2d781a29 | |
| parent | d6c5fcfbae5b957370ff5b05b3ce40ff7509acef (diff) | |
| download | samba-a35138a0013354c30a65b931f9b4a327c6d95a9c.tar.gz samba-a35138a0013354c30a65b931f9b4a327c6d95a9c.tar.xz samba-a35138a0013354c30a65b931f9b4a327c6d95a9c.zip | |
Evenscripts: update 60.nfs to use ctdb_setup_service_state_dir.
The state directory basename becomes "nfs" rather than "statd". One
line of code i moved from the "startup" event to service_start().
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit cc4c5c19af7efe01c48f73bb5ec5e607ed79db4c)
| -rwxr-xr-x | ctdb/config/events.d/60.nfs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs index bdd9427f02..50890010f3 100755 --- a/ctdb/config/events.d/60.nfs +++ b/ctdb/config/events.d/60.nfs @@ -6,11 +6,10 @@ service_name="nfs" service_start () { - mkdir -p $CTDB_VARDIR/state/nfs - mkdir -p $CTDB_VARDIR/state/statd/ip startstop_nfs stop startstop_nfs start set_proc "sys/net/ipv4/tcp_tw_recycle" 1 + touch "$service_state_dir/update-trigger" } service_stop () { @@ -22,6 +21,8 @@ loadconfig [ "$NFS_SERVER_MODE" != "GANESHA" ] || exit 0 +ctdb_setup_service_state_dir + ctdb_start_stop_service is_ctdb_managed_service || exit 0 @@ -32,8 +33,6 @@ case "$1" in ;; startup) ctdb_service_start - mkdir -p $CTDB_VARDIR/state/statd - touch $CTDB_VARDIR/state/statd/update-trigger ;; shutdown) @@ -183,11 +182,10 @@ case "$1" in # once every 600 seconds, update the statd state database for which # clients need notifications - LAST_UPDATE=`stat --printf="%Y" $CTDB_VARDIR/state/statd/update-trigger 2>/dev/null` + LAST_UPDATE=`stat --printf="%Y" "$service_state_dir/update-trigger"` CURRENT_TIME=`date +"%s"` [ $CURRENT_TIME -ge $(($LAST_UPDATE + 600)) ] && { - mkdir -p $CTDB_VARDIR/state/statd - touch $CTDB_VARDIR/state/statd/update-trigger + touch "$service_state_dir/update-trigger" $CTDB_BASE/statd-callout updatelocal & $CTDB_BASE/statd-callout updateremote & } |