From: Martin Schwenke <mschwenke@ddn.com>
Date: Tue, 26 Nov 2024 00:25:09 +0000 (+1100)
Subject: ctdb-scripts: Fix some bit-rotted comments and whitespace
X-Git-Tag: tdb-1.4.13~344
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2084281a4a61a699deb05a18a37fc150f051e67;p=thirdparty%2Fsamba.git

ctdb-scripts: Fix some bit-rotted comments and whitespace

The top comment in the file is no longer true.

The comment about notifications doesn't really apply anymore since
upstream sm-notify is used and it does "the right thing".

shfmt wants to remove a space before a semicolon, so do that too.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tools/statd_callout_helper b/ctdb/tools/statd_callout_helper
index fd734d9ecec..a6ceb56aab9 100755
--- a/ctdb/tools/statd_callout_helper
+++ b/ctdb/tools/statd_callout_helper
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# statd must be configured to use this script as its high availability call-out.
+# statd must be configured to use statd_callout, CTDB's binary
+# counterpart to this script, as its availability call-out.
 #
 # Modern NFS utils versions use /etc/nfs.conf:
 #
@@ -24,7 +25,7 @@
 # silently if /proc/fs/lockd/nlm_end_grace is not found.
 #
 
-if [ -z "$CTDB_BASE" ] ; then
+if [ -z "$CTDB_BASE" ]; then
 	export CTDB_BASE="/usr/local/etc/ctdb"
 fi
 
@@ -227,28 +228,6 @@ notify)
 	sleep 2
 	"$CTDB_NFS_CALLOUT" "start" "nlockmgr" >/dev/null 2>&1
 
-	# we now need to send out additional statd notifications to ensure
-	# that clients understand that the lockmanager has restarted.
-	# we have three cases:
-	# 1, clients that ignore the ip address the stat notification came from
-	#    and ONLY care about the 'name' in the notify packet.
-	#    these clients ONLY work with lock failover IFF that name
-	#    can be resolved into an ipaddress that matches the one used
-	#    to mount the share.  (==linux clients)
-	#    This is handled when starting lockmanager above,  but those
-	#    packets are sent from the "wrong" ip address, something linux
-	#    clients are ok with, buth other clients will barf at.
-	# 2, Some clients only accept statd packets IFF they come from the
-	#    'correct' ip address.
-	#    Send out the notification using the 'correct' ip address and also
-	#    specify the 'correct' hostname in the statd packet.
-	#    Some clients require both the correct source address and also the
-	#    correct name. (these clients also ONLY work if the ip addresses
-	#    used to map the share can be resolved into the name returned in
-	#    the notify packet.)
-	#
-	# For all IPs we serve, collect info and push to the config database
-
 	# Construct a sed expression to take catdb output and produce pairs of:
 	#   server-IP client-IP
 	# but only for the server-IPs that are hosted on this node.