From 2de2d5dd2018708eeca7e8a7c66015f81bcaf693 Mon Sep 17 00:00:00 2001 From: Vinit Agnihotri Date: Thu, 26 Oct 2023 23:35:25 -0700 Subject: [PATCH] ctdb-scripts: Remove unnecessary 06.nfs.script Signed-off-by: Vinit Agnihotri Signed-off-by: Martin Schwenke Reviewed-by: Volker Lendecke --- ctdb/config/events/legacy/06.nfs.script | 39 ------------------- ctdb/doc/ctdb-script.options.5.xml | 3 +- ctdb/doc/ctdb.1.xml | 3 -- .../UNIT/eventscripts/06.nfs.releaseip.001.sh | 12 ------ .../UNIT/eventscripts/06.nfs.releaseip.002.sh | 12 ------ .../UNIT/eventscripts/06.nfs.takeip.001.sh | 12 ------ .../UNIT/eventscripts/06.nfs.takeip.002.sh | 12 ------ .../tests/UNIT/eventscripts/scripts/06.nfs.sh | 4 -- .../scripts/integration_real_cluster.bash | 1 - 9 files changed, 1 insertion(+), 97 deletions(-) delete mode 100755 ctdb/config/events/legacy/06.nfs.script delete mode 100755 ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh delete mode 100755 ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh delete mode 100755 ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh delete mode 100755 ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh delete mode 100644 ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh diff --git a/ctdb/config/events/legacy/06.nfs.script b/ctdb/config/events/legacy/06.nfs.script deleted file mode 100755 index b937d4332549..000000000000 --- a/ctdb/config/events/legacy/06.nfs.script +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# script to manage nfs in a clustered environment - -[ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD") - -. "${CTDB_BASE}/functions" - -service_name="nfs" - -load_script_options "service" "60.nfs" - -ctdb_setup_state_dir "service" "$service_name" - -###################################################################### - -nfs_callout_pre () -{ - _event="$1" - shift - - nfs_callout "${_event}-pre" "$@" -} - -###################################################################### - -# script_state_dir set by ctdb_setup_state_dir() -# shellcheck disable=SC2154 -nfs_callout_init "$script_state_dir" - -case "$1" in -takeip) - nfs_callout_pre "$@" - ;; - -releaseip) - nfs_callout_pre "$@" - ;; -esac diff --git a/ctdb/doc/ctdb-script.options.5.xml b/ctdb/doc/ctdb-script.options.5.xml index a01b10a949c7..ef3ad416d0d3 100644 --- a/ctdb/doc/ctdb-script.options.5.xml +++ b/ctdb/doc/ctdb-script.options.5.xml @@ -758,8 +758,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 60.nfs - This event script (along with 06.nfs) provides CTDB's NFS - service management. + This event script provides CTDB's NFS service management. diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index 75934ef50e34..e97da35489a5 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -656,7 +656,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active) 00.ctdb OK 0.014 Sat Dec 17 19:39:11 2016 01.reclock OK 0.013 Sat Dec 17 19:39:11 2016 05.system OK 0.029 Sat Dec 17 19:39:11 2016 -06.nfs OK 0.014 Sat Dec 17 19:39:11 2016 10.interface OK 0.037 Sat Dec 17 19:39:11 2016 11.natgw OK 0.011 Sat Dec 17 19:39:11 2016 11.routing OK 0.007 Sat Dec 17 19:39:11 2016 @@ -680,7 +679,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active) 00.ctdb OK 0.011 Sat Dec 17 19:40:46 2016 01.reclock OK 0.010 Sat Dec 17 19:40:46 2016 05.system OK 0.030 Sat Dec 17 19:40:46 2016 -06.nfs OK 0.014 Sat Dec 17 19:40:46 2016 10.interface OK 0.041 Sat Dec 17 19:40:46 2016 11.natgw OK 0.008 Sat Dec 17 19:40:46 2016 11.routing OK 0.007 Sat Dec 17 19:40:46 2016 @@ -717,7 +715,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active) * 00.ctdb * 01.reclock * 05.system -* 06.nfs * 10.interface 11.natgw 11.routing diff --git a/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh deleted file mode 100755 index 0546863c96d4..000000000000 --- a/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "callout succeeds" - -setup - -setup_nfs_callout - -ok_null -simple_test diff --git a/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh deleted file mode 100755 index dc44d2d1b8b9..000000000000 --- a/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "callout causes releaseip-pre to fail" - -setup - -setup_nfs_callout "releaseip-pre" - -required_result 1 "releaseip-pre" -simple_test diff --git a/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh deleted file mode 100755 index 0546863c96d4..000000000000 --- a/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "callout succeeds" - -setup - -setup_nfs_callout - -ok_null -simple_test diff --git a/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh deleted file mode 100755 index c9f3db9368f2..000000000000 --- a/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. "${TEST_SCRIPTS_DIR}/unit.sh" - -define_test "callout causes takeip-pre to fail" - -setup - -setup_nfs_callout "takeip-pre" - -required_result 1 "takeip-pre" -simple_test diff --git a/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh deleted file mode 100644 index 5912a4b858bb..000000000000 --- a/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh +++ /dev/null @@ -1,4 +0,0 @@ -setup() -{ - : -} diff --git a/ctdb/tests/scripts/integration_real_cluster.bash b/ctdb/tests/scripts/integration_real_cluster.bash index 8d3f68a0b2ca..a1f05aa68b49 100644 --- a/ctdb/tests/scripts/integration_real_cluster.bash +++ b/ctdb/tests/scripts/integration_real_cluster.bash @@ -7,7 +7,6 @@ _ctdb_enable_cluster_test_event_scripts () { local scripts=" - 06.nfs 10.interface 49.winbind 50.samba