sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Eventscripts: Do not restart NFS on reconfigure

Browse Source 
It looks like this restart was accidentally reintroduced in commit
fc0678d351187cfa4c71123f97c0f493aacd5d16 when $service_reconfigure
became unset so the default action of restarting the service would
occur.  From there cleanups have explicitly reintroduced it and
carried it through the code.

Also update the unit tests affected by this change.

The restart was originally removed in commit
bc481c3f1a44c50648488c4f8a7f15ec395d446f.

The default reconfigure action of restarting a service is clearly
suboptimal and will be addressed in a separate patch.

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

(This used to be ctdb commit 2629de72e1f37b5e46772c2ef8d8d0012fc4ed37)
This commit is contained in:
Martin Schwenke 2012-12-04 14:52:25 +11:00 committed by Amitay Isaacs
parent 6fbd3ea2c2
commit 3d408ca1e1
7 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/config/events.d/60.nfs
View File

@ -16,8 +16,6 @@ service_stop ()
}
service_reconfigure ()
{
startstop_nfs restart
# if the ips have been reallocated, we must restart the lockmanager
# across all nodes and ping all statd listeners
[ -x $CTDB_BASE/statd-callout ] && {

2
ctdb/tests/eventscripts/60.nfs.multi.001.sh
View File

@ -14,8 +14,6 @@ simple_test_event "takeip" $public_address
ok <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
EOF
simple_test_event "ipreallocated"

2
ctdb/tests/eventscripts/60.nfs.multi.002.sh
View File

@ -17,8 +17,6 @@ simple_test_event "takeip" $public_address
# to split this into 2 tests.
ok <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
Replaying previous status for this script due to reconfigure...
EOF

2
ctdb/tests/eventscripts/60.nfs.multi.003.sh
View File

@ -18,8 +18,6 @@ ctdb_fake_scriptstatus 1 "ERROR" "$err"
required_result 1 <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
Replaying previous status for this script due to reconfigure...
$err
EOF

2
ctdb/tests/eventscripts/60.nfs.multi.004.sh
View File

@ -18,8 +18,6 @@ ctdb_fake_scriptstatus -62 "TIMEDOUT" "$err"
required_result 1 <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
Replaying previous status for this script due to reconfigure...
[Replay of TIMEDOUT scriptstatus - note incorrect return code.] $err
EOF

2
ctdb/tests/eventscripts/60.nfs.multi.005.sh
View File

@ -18,8 +18,6 @@ ctdb_fake_scriptstatus -8 "DISABLED" "$err"
ok <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
Replaying previous status for this script due to reconfigure...
[Replay of DISABLED scriptstatus - note incorrect return code.] $err
EOF

2
ctdb/tests/eventscripts/60.nfs.multi.006.sh
View File

@ -13,8 +13,6 @@ err=""
ok <<EOF
Reconfiguring service "nfs"...
Starting nfslock: OK
Starting nfs: OK
EOF
simple_test_event "reconfigure"