Blame 0004-rpc-wait-longer-for-session-daemon-to-start-up.patch
|
 |
d6cc78 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
d6cc78 |
Date: Tue, 15 Mar 2016 17:04:32 -0400
|
|
|
d6cc78 |
Subject: [PATCH] rpc: wait longer for session daemon to start up
|
|
|
d6cc78 |
|
|
|
d6cc78 |
https://bugzilla.redhat.com/show_bug.cgi?id=1271183
|
|
|
d6cc78 |
|
|
|
d6cc78 |
We only wait 0.5 seconds for the session daemon to start up and present
|
|
|
d6cc78 |
its socket, which isn't sufficient for many users. Bump up the sleep
|
|
|
d6cc78 |
interval and retry amount so we wait for a total of 5.0 seconds.
|
|
|
d6cc78 |
|
|
|
d6cc78 |
(cherry picked from commit ca0c06f4008154de55e0b3109885facd0bf02d32)
|
|
|
d6cc78 |
---
|
|
|
d6cc78 |
src/rpc/virnetsocket.c | 4 ++--
|
|
|
d6cc78 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
d6cc78 |
|
|
|
d6cc78 |
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
|
|
|
d6cc78 |
index b0d5b1c..d909b94 100644
|
|
|
d6cc78 |
--- a/src/rpc/virnetsocket.c
|
|
|
d6cc78 |
+++ b/src/rpc/virnetsocket.c
|
|
|
d6cc78 |
@@ -614,7 +614,7 @@ int virNetSocketNewConnectUNIX(const char *path,
|
|
|
d6cc78 |
char *lockpath = NULL;
|
|
|
d6cc78 |
int lockfd = -1;
|
|
|
d6cc78 |
int fd = -1;
|
|
|
d6cc78 |
- int retries = 100;
|
|
|
d6cc78 |
+ int retries = 500;
|
|
|
d6cc78 |
virSocketAddr localAddr;
|
|
|
d6cc78 |
virSocketAddr remoteAddr;
|
|
|
d6cc78 |
char *rundir = NULL;
|
|
|
d6cc78 |
@@ -707,7 +707,7 @@ int virNetSocketNewConnectUNIX(const char *path,
|
|
|
d6cc78 |
daemonLaunched = true;
|
|
|
d6cc78 |
}
|
|
|
d6cc78 |
|
|
|
d6cc78 |
- usleep(5000);
|
|
|
d6cc78 |
+ usleep(10000);
|
|
|
d6cc78 |
}
|
|
|
d6cc78 |
|
|
|
d6cc78 |
localAddr.len = sizeof(localAddr.data);
|