1 commit 8b6c9bb794361c75b0aa96bede8a3f71d1dd663e
2 Author: Jacek Konieczny <jajcus@jajcus.net>
3 Date: Wed Dec 12 11:59:42 2012 +0100
5 clvmd: command timeout handling fix
7 clvmd would wait for select() to time-out before processing command
8 time-outs. The select timeout would be set to the cmd_timeout ('-t'
9 command-line option) value, which is 60 seconds by default.
11 Normally the select() call is woken up more frequently, so the command
12 time-outs are never processed. This causes LVM tools wait forever on
13 cluster locking for operations started during temporary cluster
16 Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
18 diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
19 index eb0bffd..2b5d753 100644
20 --- a/daemons/clvmd/clvmd.c
21 +++ b/daemons/clvmd/clvmd.c
22 @@ -939,8 +939,8 @@ static void main_loop(int local_sock, int cmd_timeout)
26 - /* Select timed out. Check for clients that have been waiting too long for a response */
27 - if (select_status == 0) {
28 + /* Check for clients that have been waiting too long for a response */
29 + if (select_status >= 0) {
30 time_t the_time = time(NULL);
32 for (thisfd = &local_client_head; thisfd != NULL;