ctdb-scripts: Remove ctdb_service_start() and ctdb_service_stop()

They contain too much unnecessary complexity, some of which was used
to support CTDB_SERVICE_AUTOSTARTSTOP.

Also removed unused functions for service management.

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

diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd
index 500fb2fd82c92ea06efde0a8245685741133f658..815091443da6a3e029c3cc77132488dba83996a4 100755 (executable)
--- a/ctdb/config/events.d/31.clamd
+++ b/ctdb/config/events.d/31.clamd
@@ -35,12 +35,12 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-       ctdb_service_start
-        ;;
+       service_start
+       ;;
 
 shutdown)
-        ctdb_service_stop
-        ;;
+       service_stop
+       ;;
 
 monitor)
         ctdb_check_unix_socket "$CTDB_CLAMD_SOCKET" || exit $?

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index 2fbe3c10415ccdb0652a32e6c12313e96c1165eb..6be00053e9d480cb26d4d1cc367be7e49cb7b820 100755 (executable)
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -29,11 +29,12 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-       ctdb_service_start
+       service_start
+       ctdb_counter_init
        ;;
 
 shutdown)
-       ctdb_service_stop
+       service_stop
        ;;
 
 takeip|releaseip)

diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd
index 87503484e0e9e374a041f51078dc64d3231f0e3c..b9aa7e12c3cb2a8aa8923506da60529c9cbeb1b4 100755 (executable)
--- a/ctdb/config/events.d/41.httpd
+++ b/ctdb/config/events.d/41.httpd
@@ -51,11 +51,12 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-       ctdb_service_start
+       service_start
+       ctdb_counter_int
        ;;
 
 shutdown)
-       ctdb_service_stop
+       service_stop
        ;;
 
 monitor)

diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index 8955c507d0214bf95814a6ef980700997bbccf17..c9d7aca2bc979677e11b77ae9ade76b29c9438eb 100755 (executable)
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -40,11 +40,11 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-       ctdb_service_start
+       service_start
        ;;
 
 shutdown)
-       ctdb_service_stop
+       service_stop
        ;;
 
 monitor)

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index 603e708351527758d01ca57ab1920a63f448a1c6..4c32e4ee002f883aa39a502b55d8c6887417214e 100755 (executable)
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -155,11 +155,11 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-       ctdb_service_start
+       service_start
        ;;
 
 shutdown)
-       ctdb_service_stop
+       service_stop
        ;;
 
 monitor)

diff --git a/ctdb/config/functions b/ctdb/config/functions
index d3866531de9add235ad719a812faba89473998ed..44e542ae11c8dd552744ac4aba46adfe095a233b 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -757,33 +757,6 @@ ctdb_setup_service_state_dir ()
        echo "$_service_state_dir"
 }
 
-########################################################
-# Managed status history, for auto-start/stop
-
-_ctdb_managed_common ()
-{
-    _ctdb_managed_file="${CTDB_SCRIPT_VARDIR}/managed_history/${service_name}"
-}
-
-ctdb_service_managed ()
-{
-    _ctdb_managed_common
-    mkdir -p "${_ctdb_managed_file%/*}" # dirname
-    touch "$_ctdb_managed_file"
-}
-
-ctdb_service_unmanaged ()
-{
-    _ctdb_managed_common
-    rm -f "$_ctdb_managed_file"
-}
-
-is_ctdb_previously_managed_service ()
-{
-    _ctdb_managed_common
-    [ -f "$_ctdb_managed_file" ]
-}
-
 ##################################################################
 # Reconfigure a service on demand
 
@@ -829,7 +802,7 @@ service_reconfigure ()
 }
 
 ##################################################################
-# Does CTDB manage this service? - and associated auto-start/stop
+# Does CTDB manage this service?
 
 ctdb_compat_managed_service ()
 {
@@ -868,24 +841,6 @@ is_ctdb_managed_service ()
     [ "${t#* ${service_name} }" != "${t}" ]
 }
 
-ctdb_service_start ()
-{
-    # The service is marked managed if we've ever tried to start it.
-    ctdb_service_managed
-
-    service_start || return $?
-
-    # Intentionally have this use $service_name as default
-    # shellcheck disable=SC2119
-    ctdb_counter_init
-}
-
-ctdb_service_stop ()
-{
-    ctdb_service_unmanaged
-    service_stop
-}
-
 # Default service_start() and service_stop() functions.
  
 # These may be overridden in an eventscript.