Attachment 12956 Details for Bug 12589 – Patch for 4.3 and 4.4

[patch] Patch for 4.3 and 4.4

BZ12589-v4.3+v4.4.patch (text/plain), 1.68 KB, created by Martin Schwenke on 2017-02-16 23:38:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2017-02-16 23:38:00 UTC

Size: 1.68 KB

patch

obsolete

>From 06571ee212fad0d819b4aacbe68324bfebc27400 Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>Date: Tue, 14 Feb 2017 09:04:41 +1100
>Subject: [PATCH] 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)
>---
> ctdb/config/statd-callout | 3 +++
> 1 file changed, 3 insertions(+)
>
>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
>-- 
>2.11.0
>

Flags:

amitay: review+

Actions: View

Attachments on bug 12589: 12953 | 12956