From: Martin Schwenke <mschwenke@ddn.com>
Date: Tue, 25 Jun 2024 01:06:19 +0000 (+1000)
Subject: ctdb-scripts: Change default persistent DB for statd_callout_helper
X-Git-Tag: tdb-1.4.13~336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86cdaf5a2eeb9252fe16dfa4d215065cf1c748c2;p=thirdparty%2Fsamba.git

ctdb-scripts: Change default persistent DB for statd_callout_helper

This database isn't use throughout CTDB, so name the it more
specifically.

Note that this might cause locks to be lost during upgrade to the
first version containing this change.

For testing, a different name is chosen to exercise related
functionality.

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

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Dec 13 15:01:10 UTC 2024 on atb-devel-224
---

diff --git a/ctdb/doc/ctdb-script.options.5.xml b/ctdb/doc/ctdb-script.options.5.xml
index 9f04bcfa268..ab141e5829b 100644
--- a/ctdb/doc/ctdb-script.options.5.xml
+++ b/ctdb/doc/ctdb-script.options.5.xml
@@ -1065,7 +1065,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 		  </para>
 		  <para>
 		    If :TDB is omitted then TDB defaults to
-		    <filename>ctdb.tdb</filename>.
+		    <filename>ctdb_statd_callout.tdb</filename>.
 		  </para>
 		</listitem>
 	      </varlistentry>
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
index fea83fde2f8..10912c5d3e5 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
@@ -10,7 +10,7 @@ setup()
 
 	case "$CTDB_STATD_CALLOUT_SHARED_STORAGE" in
 	"" | persistent_db)
-		CTDB_STATD_CALLOUT_SHARED_STORAGE="persistent_db:ctdb.tdb"
+		CTDB_STATD_CALLOUT_SHARED_STORAGE="persistent_db:statd_foo.tdb"
 		;;
 	shared_dir)
 		export CTDB_NFS_SHARED_STATE_DIR="/clusterfs"
@@ -87,7 +87,7 @@ check_shared_storage_statd_state()
 	case "$statd_callout_mode" in
 	persistent_db)
 		if [ -z "$statd_callout_location" ]; then
-			statd_callout_location="ctdb.tdb"
+			statd_callout_location="statd_foo.tdb"
 		fi
 		check_ctdb_tdb_statd_state "$@"
 		;;
diff --git a/ctdb/tools/statd_callout_helper b/ctdb/tools/statd_callout_helper
index 11018029412..b4606470cf8 100755
--- a/ctdb/tools/statd_callout_helper
+++ b/ctdb/tools/statd_callout_helper
@@ -93,7 +93,7 @@ fi
 
 case "$statd_callout_mode" in
 persistent_db)
-	statd_callout_db="${statd_callout_location:-ctdb.tdb}"
+	statd_callout_db="${statd_callout_location:-ctdb_statd_callout.tdb}"
 	statd_callout_queue_dir="${statd_callout_state_dir}/queue"
 	;;
 shared_dir)