shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

dmeventd: check pidfile for exit instead of polling via protocol

Browse Source 
Since we use unlink + _exit now on dmeventd DIE message, we can
check the pidfile existence to see whether the dmeventd has finished.
This commit is contained in:
Peter Rajnoha 2014-02-06 17:53:03 +01:00
parent 90286fa0e9
commit 73f30ed6a4
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
daemons/dmeventd/dmeventd.c
View File

@ -1535,8 +1535,11 @@ static void _process_request(struct dm_event_fifos *fifos)
dm_free(msg.data);
if (die)
if (die) {
if (unlink(DMEVENTD_PIDFILE))
perror(DMEVENTD_PIDFILE ": unlink failed");
_exit(0);
}
}
static void _process_initial_registrations(void)
@ -2001,41 +2004,17 @@ static void restart(void)
((e = getenv(SD_ACTIVATION_ENV_VAR_NAME)) && strcmp(e, "1")))
_systemd_activation = 1;
/*
* If we're under systemd management, just send the initial
* registrations to the fifo - this will instantiate new dmeventd.
* If not under systemd management, continue with this process
* to take over the old dmeventd.
*/
if (!_systemd_activation) {
/*
* Non-systemd environment.
* Wait for daemon to die, detected by sending further DIE messages
* until one fails. This is really silly, but since nobody cleans up
* the pidfile after SIGKILL is received in old dmeventd, we have to
* do it this way.
*/
for (i = 0; i < 10; ++i) {
if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0))
break; /* yep, it's dead probably */
usleep(10);
}
fini_fifos(&fifos);
return;
}
/*
* Systemd environment.
* Wait for daemon to die, detected by checking the pidfile.
* We can do this - systemd cleans up the pidfile automatically
* for us even if we don't do that when SIGKILL is received in old dmeventd.
*/
for (i = 0; i < 10; ++i) {
if ((access(DMEVENTD_PIDFILE, F_OK) == -1) && (errno == ENOENT))
break;
usleep(10);
}
if (!_systemd_activation) {
fini_fifos(&fifos);
return;
}
/* Reopen fifos. */
fini_fifos(&fifos);
if (!init_fifos(&fifos)) {