diff options
| author | Srikrishan Malik <srimalik@in.ibm.com> | 2013-01-09 16:11:39 +0530 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-01-11 17:16:46 +1100 |
| commit | 28cbe527d47822f870e8252495ab2a1c8fddd12f (patch) | |
| tree | 7a57d9be9ad620cc5bbeef83ca316f19c4205055 /ctdb/config/statd-callout | |
| parent | 96ba39669776fc0931571cb361d11982d079c016 (diff) | |
| download | samba-28cbe527d47822f870e8252495ab2a1c8fddd12f.tar.gz | |
Changes for unobtrusive recovery and new method for health check.
Unobtrusive recovery: Ganesha will not be restarted on failovers.
Ganesha health: Use the counters in /var/lib/nfs/ganesha_local to track progress
instead of the null call which can timeout if the server is too busy.
Signed-off-by: Srikrishan Malik <srimalik@in.ibm.com>
Signed-off-by: Lance Russell <lancerus@us.ibm.com>
(This used to be ctdb commit 0e651e9da0f1f3c836b4474612ab13d0ccd272d9)
Diffstat (limited to 'ctdb/config/statd-callout')
| -rwxr-xr-x | ctdb/config/statd-callout | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout index 72a2ca96401..a9c2e3dfba5 100755 --- a/ctdb/config/statd-callout +++ b/ctdb/config/statd-callout @@ -136,11 +136,7 @@ case "$1" in # will respond "strangely" immediately after restarting it, which # causes clients to fail to reclaim the locks. # - if [ "$NFS_SERVER_MODE" = "ganesha" ] ; then - startstop_ganesha stop >/dev/null 2>&1 - sleep 2 - startstop_ganesha start >/dev/null 2>&1 - else + if [ "$NFS_SERVER_MODE" != "ganesha" ] ; then startstop_nfslock stop >/dev/null 2>&1 sleep 2 startstop_nfslock start >/dev/null 2>&1 |