wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-13 10:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call HOOK_SVC_RECONF only when all processes have been stopped

Browse Source 
This patch fixes a race condition when doing an ordered RELOAD and STOP
event sequence.  For services that shall be stopped it is imperative
that we wait for them to be colleced by the `service_monitor()`, so that
we know they have really been stopped, before calling HOOK_SVC_RECONF.

The latter is a promise to external services that all services have been
indeed stopped.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2015-11-19 19:29:16 +01:00
parent c8f0b97d0f
commit 87f9b94b42
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service.c
+31 -3
View File
@@ -41,6 +41,8 @@
#define RESPAWN_MAX 10 /* Prevent endless respawn of faulty services. */
static int dyn_stop_cnt = 0;
static int is_norespawn (void);
static void restart_lost_procs (void);
static void svc_dance (svc_t *svc);
@@ -364,6 +366,26 @@ void service_start_dynamic(void)
svc_clean_dynamic(service_unregister);
}
/*
* Unless there are services we must collect first (wait for
* them to stop), we can call HOOK_SVC_RECONF here.
*/
static int service_stop_done(svc_t *svc)
{
if (svc && !svc_is_changed(svc))
return 0;
if (svc && dyn_stop_cnt)
dyn_stop_cnt--;
if (!dyn_stop_cnt) {
_d("All disabled/removed services have been stoppped, calling reconf hooks ...");
plugin_run_hooks(HOOK_SVC_RECONF); /* Reconfigure HW/VLANs/etc here */
}
return 1;
}
/**
* service_stop_dynamic - Stop disabled/removed dynamic services
*/
@@ -373,12 +395,14 @@ void service_stop_dynamic(void)
_d("Stopping disabled/removed services ...");
for (svc = svc_dynamic_iterator(1); svc; svc = svc_dynamic_iterator(0)) {
if (svc_is_changed(svc))
if (svc_is_changed(svc)) {
dyn_stop_cnt++;
service_stop(svc);
}
}
_d("All disabled/removed services have been stoppped, calling reconf hooks ...");
plugin_run_hooks(HOOK_SVC_RECONF); /* Reconfigure HW/VLANs/etc here */
/* Check if we need to collect any services before calling user HOOK */
service_stop_done(NULL);
}
/* stop + start
@@ -809,6 +833,10 @@ void service_monitor(pid_t lost)
/* No longer running, update books. */
svc->pid = 0;
/* Check if we're still collecting stopped dynamic services */
if (service_stop_done(svc))
break;
if (sig_stopped()) {
_e("Stopped, not respawning killed processes.");
break;