ctdb-scripts: Move the reconfigure flag to the script state directory

Scripts that use these functions must call ctdb_setup_state_dir().

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

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index f3c4848b4388c554589fc5b6e62945d195d16bf2..95de406e0031b3a6dad86c54cb4c5226d3289651 100755 (executable)
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -15,6 +15,8 @@ service_reconfigure ()
 
 loadconfig
 
+ctdb_setup_state_dir "service" "$service_name"
+
 is_ctdb_managed_service || exit 0
 
 case "$1" in

diff --git a/ctdb/config/functions b/ctdb/config/functions
index ae146111cdda4891002a43f145f8ef3cec53b2ca..5070796a2696e103337e94375a6ae6ac06528a4c 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -743,9 +743,11 @@ ctdb_setup_state_dir ()
 
 _ctdb_service_reconfigure_common ()
 {
-    _d="${CTDB_SCRIPT_VARDIR}/service_status/${service_name}"
-    mkdir -p "$_d"
-    _ctdb_service_reconfigure_flag="$_d/reconfigure"
+       if [ -z "$script_state_dir" ] ; then
+               die "ctdb_service_*_reconfigure() needs ctdb_setup_state_dir()"
+       fi
+
+       _ctdb_service_reconfigure_flag="${script_state_dir}/need_reconfigure"
 }
 
 ctdb_service_needs_reconfigure ()