ctdb-scripts: Drop use of ctdb_standard_event_handler()

It doesn't do anything.  Add a comment to its definition to explain
why it is still there.

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

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index d7b238f87a3c9f926703ed950d0807ceed7aea6a..c4d98a29cf7eaee41ce1a1aee86fe3e54b1c9eab 100755 (executable)
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -142,10 +142,6 @@ case "$1" in
     startup)
        $CTDB attach ctdb.tdb persistent
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 # all OK

diff --git a/ctdb/config/events.d/01.reclock b/ctdb/config/events.d/01.reclock
index 52e65b98466f5337a66acd3e990e8fa55fdd9f4e..0377ca4c84753598dfa32189fda7e0b5d1a7aa42 100755 (executable)
--- a/ctdb/config/events.d/01.reclock
+++ b/ctdb/config/events.d/01.reclock
@@ -47,10 +47,6 @@ case "$1" in
 
        ctdb_check_counter "error" -gt 3
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/05.system b/ctdb/config/events.d/05.system
index 2dbfca52ba7a7472105c201b0c36bc53fbbe17fe..38e40276bf29ef964d8732d3ea8efad4b52ddb88 100755 (executable)
--- a/ctdb/config/events.d/05.system
+++ b/ctdb/config/events.d/05.system
@@ -168,10 +168,6 @@ case "$1" in
        monitor_filesystem_usage
        monitor_memory_usage
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 9b9a8cdb6b927f9f38c3fb36c5ffdc6e490bc6d8..57baba7c4ff02e594a6b2ac2bc1b0a91aae6aa16 100755 (executable)
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -246,9 +246,6 @@ case "$1" in
     monitor)
        monitor_interfaces || exit 1
        ;;
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index 04eea81b43da4f41e4668358000eafcf57b9fe92..9fdf93f2887deef8f8851b9ae0d5b2de0a86af91 100755 (executable)
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -238,10 +238,6 @@ case "$1" in
            interface_monitor "$CTDB_NATGW_PUBLIC_IFACE" || exit 1
        fi
        ;;
-
-    *)
-       ctdb_standard_event_handler "@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/11.routing b/ctdb/config/events.d/11.routing
index 87c0027124bdd4bd56c968c84f33667134f966f5..941a7a8f1311908747ff793893ea2ed97bcaed32 100755 (executable)
--- a/ctdb/config/events.d/11.routing
+++ b/ctdb/config/events.d/11.routing
@@ -44,10 +44,6 @@ case "$1" in
            fi
        done <"${CTDB_BASE}/static-routes"
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index 20f9085383e74c13231b983cbac3c4ca25c09d6e..34bbf7f332a3fb311b6877dc517c13276922c7be 100755 (executable)
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -415,10 +415,6 @@ case "$1" in
        add_missing_routes
        remove_bogus_routes
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/20.multipathd b/ctdb/config/events.d/20.multipathd
index b5f71e55630a58c81d0e4ec42621d569f0cf8e4f..c16c24cf33512298d66303e189922eac8b693819 100755 (executable)
--- a/ctdb/config/events.d/20.multipathd
+++ b/ctdb/config/events.d/20.multipathd
@@ -75,10 +75,6 @@ case "$1" in
     monitor)
        multipathd_check || die "multipath monitoring failed"
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd
index 2e5eefea2518a1c548c87bf353d4758df64be977..22b11b8f851628612b969156f27ac9325fc0d4e3 100755 (executable)
--- a/ctdb/config/events.d/31.clamd
+++ b/ctdb/config/events.d/31.clamd
@@ -43,10 +43,6 @@ case "$1" in
     monitor)
         ctdb_check_unix_socket ${CTDB_CLAMD_SOCKET} || exit $?
         ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index c1f193bcf8ebfbb6ce888383ff16e5a5f401ef94..5f2f44a79ad1b128de973a1ff980f62908124d0b 100755 (executable)
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -59,10 +59,6 @@ case "$1" in
            fi
        fi      
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd
index 6c70d1f2edbe9442013d88b82aaec2e9d418ed8f..9fb75072254d16608c41838516eae1dc13d667be 100755 (executable)
--- a/ctdb/config/events.d/41.httpd
+++ b/ctdb/config/events.d/41.httpd
@@ -76,10 +76,6 @@ case "$1" in
            }
        fi
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index da04546b1f4209aaf84dfbca9ae1104979fde023..db93fafc160eb8f527941ee85d3ced45ea336a7b 100755 (executable)
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -52,10 +52,6 @@ case "$1" in
      monitor)
        ctdb_check_command wbinfo -p
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index 7c3a804475fe0819a9279f7837af8952ae36d7d2..ee4033f1c440274c614f7d4380827109952c0605 100755 (executable)
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -180,10 +180,6 @@ case "$1" in
            testparm_background_update 10
        fi
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index 249b22621794e47d83b9de5bf72e2a75c79aa1fa..e5d87424ce678bbb59f188b586bf94f5fcda3ea3 100755 (executable)
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -280,10 +280,6 @@ case "$1" in
 
        nfs_callout "monitor-post" || exit $?
                ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi
index 2d9e4a64fa18c053c9acdcc9077f65a52306de2f..8c3f712b28df6c18d9eabd1d181b2ba6efc79101 100755 (executable)
--- a/ctdb/config/events.d/70.iscsi
+++ b/ctdb/config/events.d/70.iscsi
@@ -82,10 +82,6 @@ EOF
     monitor)
        ctdb_check_tcp_ports 3260 || exit $?
        ;;
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/events.d/99.timeout b/ctdb/config/events.d/99.timeout
index 7c226d6566b0d8e9d88be7d41f272320b0677ec2..2c70599d25cd5857837bbb86c30d4543217574c7 100755 (executable)
--- a/ctdb/config/events.d/99.timeout
+++ b/ctdb/config/events.d/99.timeout
@@ -19,11 +19,6 @@ case "$1" in
        echo "sleeping for $((TIMEOUT * 2)) seconds..."
        sleep $((TIMEOUT * 2))
        ;;
-
-
-    *)
-       ctdb_standard_event_handler "$@"
-       ;;
 esac
 
 exit 0

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 8f0b790983c8ee3c8f0b9d0102dc97abb34f4e1e..9b4e479c631072c664d81d8c99f9257ef8045e90 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -1127,6 +1127,8 @@ service_stop ()
 
 ##################################################################
 
+# This exists only for backward compatibility with 3rd party scripts
+# that call it
 ctdb_standard_event_handler ()
 {
     :