summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-03-12 14:46:53 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2012-03-12 14:46:53 +0000
commit65cfc5d16d782df621fc161e876bc949b9ff28b2 (patch)
treebc20f44772e36b4c592503400dc96d9bba645bf9
parent0f2bbb87639383d974cdc173a2b4b942749c063b (diff)
downloadlvm2-65cfc5d16d782df621fc161e876bc949b9ff28b2.tar.gz
lvm2-65cfc5d16d782df621fc161e876bc949b9ff28b2.tar.xz
lvm2-65cfc5d16d782df621fc161e876bc949b9ff28b2.zip
We need longer window for checking read from fifo.
Seems like some dmeventd startups are taking more time then expected, so make the time window longer here.
-rw-r--r--WHATS_NEW_DM1
-rw-r--r--daemons/dmeventd/libdevmapper-event.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index f21d8062..a41876b2 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.75 -
================================
+ Make the time window for reading fifo longer 5sec (1.02.73).
Version 1.02.74 - 6th March 2012
================================
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index ca0a6408..63c48dc8 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -245,7 +245,7 @@ static int _daemon_read(struct dm_event_fifos *fifos,
log_error("Unable to read from event server");
return 0;
}
- if ((ret == 0) && i && !bytes) {
+ if ((ret == 0) && (i > 4) && !bytes) {
log_error("No input from event server.");
return 0;
}