diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-02-14 09:04:41 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-02-17 16:02:00 +0100 |
| commit | f2924e98ab843f2befcf9f0e76505ba4e55bca4d (patch) | |
| tree | 76680ffe571e9398715b703bae3fdbbc7616b59f | |
| parent | 44de4e0f5f33c57164ab61ab9666451cc2394ee8 (diff) | |
| download | samba-f2924e98ab843f2befcf9f0e76505ba4e55bca4d.tar.gz | |
ctdb-scripts: Initialise CTDB_NFS_CALLOUT in statd-callout
Some configurations may set CTDB_NFS_CALLOUT to the empty string.
They may do this if they allow a choice of NFS implementations. In
this case the default call-out for Linux kernel NFS should be used.
However, statd-callout does not call nfs_callout_init() to set the
default. Therefore, statd-callout is unable to restart the lock
manager, so the grace period is never entered.
statd-callout must call nfs_callout_init() before trying to restart
the lock manager.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12589
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Feb 16 09:21:03 CET 2017 on sn-devel-144
(cherry picked from commit 5e7ae1b1e2fa8137aaa6a2a2f446156ae61f4c84)
Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Fri Feb 17 16:02:00 CET 2017 on sn-devel-144
| -rwxr-xr-x | ctdb/config/statd-callout | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout index a923d8a89b5..9fbf8215ffe 100755 --- a/ctdb/config/statd-callout +++ b/ctdb/config/statd-callout @@ -121,6 +121,9 @@ case "$1" in # where the lock manager will respond "strangely" immediately # after restarting it, which causes clients to fail to reclaim # their locks. + if [ -z "$CTDB_NFS_CALLOUT" ] ; then + CTDB_NFS_CALLOUT="${CTDB_BASE}/nfs-linux-kernel-callout" + fi "$CTDB_NFS_CALLOUT" "stop" "nlockmgr" >/dev/null 2>&1 sleep 2 "$CTDB_NFS_CALLOUT" "start" "nlockmgr" >/dev/null 2>&1 |