diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2012-03-14 11:16:00 +0000 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2012-03-14 11:16:00 +0000 |
| commit | c02af0773f77ddfb4421f715d9bd37b546ea78d1 (patch) | |
| tree | 553794a25e31681ecd78bd7fca4a2fc97cf1a49d | |
| parent | bba1e4d11fdb7768383351c4e562e1597d84e864 (diff) | |
| download | lvm2-c02af0773f77ddfb4421f715d9bd37b546ea78d1.tar.gz lvm2-c02af0773f77ddfb4421f715d9bd37b546ea78d1.tar.xz lvm2-c02af0773f77ddfb4421f715d9bd37b546ea78d1.zip | |
Do not run a new dmeventd instance on restart if there's no existing one.
| -rw-r--r-- | WHATS_NEW_DM | 1 | ||||
| -rw-r--r-- | daemons/dmeventd/dmeventd.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index a41876b2..afa69445 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.75 - ================================ + Do not run a new dmeventd instance on restart if there's no existing one. Make the time window for reading fifo longer 5sec (1.02.73). Version 1.02.74 - 6th March 2012 diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 456fa7da..b61fb8b8 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -1829,13 +1829,13 @@ static void restart(void) if (!init_fifos(&fifos)) { fprintf(stderr, "WARNING: Could not initiate communication with existing dmeventd.\n"); - return; + exit(EXIT_FAILURE); } if (!dm_event_get_version(&fifos, &version)) { fprintf(stderr, "WARNING: Could not communicate with existing dmeventd.\n"); fini_fifos(&fifos); - return; + exit(EXIT_FAILURE); } if (version < 1) { |