From: Martin Schwenke <martin@meltin.net>
Date: Mon, 31 Jan 2022 08:30:30 +0000 (+1100)
Subject: ctdb-scripts: No longer load tunables via 00.ctdb.script setup event
X-Git-Tag: tevent-0.12.0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0902553d1546b418e27cb14ae5146a8396accd09;p=thirdparty%2Fsamba.git

ctdb-scripts: No longer load tunables via 00.ctdb.script setup event

Drop related tests.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events/legacy/00.ctdb.script b/ctdb/config/events/legacy/00.ctdb.script
index 05ce2bec14b..b1c9890e751 100755
--- a/ctdb/config/events/legacy/00.ctdb.script
+++ b/ctdb/config/events/legacy/00.ctdb.script
@@ -101,27 +101,6 @@ EOF
     done
 }
 
-set_ctdb_variables ()
-{
-	_f="${CTDB_BASE}/ctdb.tunables"
-	if [ ! -r "$_f" ] ; then
-		return
-	fi
-
-	while IFS="=" read _var _val ; do
-		case "$_var" in
-		\#*|"") continue ;;
-		esac
-
-		if $CTDB setvar "$_var" "$_val" ; then
-			echo "Set $_var to $_val"
-		else
-			echo "Invalid tunable: ${_var}=${_val}"
-			return 1
-		fi
-	done <"$_f"
-}
-
 ############################################################
 
 ctdb_check_args "$@"
@@ -142,12 +121,6 @@ init)
 	fi
 	;;
 
-setup)
-	# Set any tunables from the config file
-	set_ctdb_variables || \
-	    die "Aborting setup due to invalid configuration - fix typos, remove unknown tunables"
-	;;
-
 startup)
 	$CTDB attach ctdb.tdb persistent
 	;;
diff --git a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh
deleted file mode 100755
index 8ab1c305ced..00000000000
--- a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "setup, no tunables in config"
-
-setup
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh
deleted file mode 100755
index 10bddea1549..00000000000
--- a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "setup, known tunables in config"
-
-setup
-
-setup_tunable_config <<EOF
-MonitorInterval=5
-EOF
-
-required_result 0 <<EOF
-Set MonitorInterval to 5
-EOF
-
-simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh
deleted file mode 100755
index 7a82b254b24..00000000000
--- a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "setup, known and unknown tunables in config"
-
-setup
-
-setup_tunable_config <<EOF
-MonitorInterval=5
-UnknownMagic=0
-EOF
-
-required_result 1 <<EOF
-Set MonitorInterval to 5
-Unable to set tunable variable 'UnknownMagic'
-Invalid tunable: UnknownMagic=0
-Aborting setup due to invalid configuration - fix typos, remove unknown tunables
-EOF
-
-simple_test
diff --git a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh
deleted file mode 100755
index b10865ce884..00000000000
--- a/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "setup, known and obsolete tunables in config"
-
-setup
-
-setup_tunable_config <<EOF
-MonitorInterval=5
-EventScriptUnhealthyOnTimeout=0
-EOF
-
-required_result 0 <<EOF
-Set MonitorInterval to 5
-Setting obsolete tunable variable 'EventScriptUnhealthyOnTimeout'
-Set EventScriptUnhealthyOnTimeout to 0
-EOF
-
-simple_test