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 9f04bcfa2681828392acbc338487323037c2e4eb..ab141e5829b965c779656579d9d8b073ee0100ce 100644 (file)
--- 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 fea83fde2f8639b6490d557203ebd411da4f3cde..10912c5d3e526f59307abcd15e9edf24a5abb575 100644 (file)
--- 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 11018029412e2954f7b5f3503d47deecaa2517af..b4606470cf83dc203a03433be6d24e2346296c93 100755 (executable)
--- 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)