diff mbox

rpc: wait longer for session daemon to start up

Message ID fa22d0fd297e648392048fcd3ee67c9900c82130.1458076126.git.crobinso@redhat.com
State Accepted
Commit ca0c06f4008154de55e0b3109885facd0bf02d32
Headers show

Commit Message

Cole Robinson March 15, 2016, 9:10 p.m. UTC
https://bugzilla.redhat.com/show_bug.cgi?id=1271183

We only wait .5 seconds for the session daemon to start up and present
its socket, which isn't sufficient for many users. Bump up the sleep
interval and retry amount so we wait for a total of 5 seconds.
---
danpb suggests dropping the reverting this:

commit be78814ae07f092d9c4e71fd82dd1947aba2f029
Author: Michal Privoznik <mprivozn@redhat.com>
Date:   Thu Apr 2 14:41:17 2015 +0200

    virNetSocketNewConnectUNIX: Use flocks when spawning a daemon


Prior to that we didn't need the retry logic at all... but that's a
bit more involved and boxes users are suffering with this issue in
the meantime


 src/rpc/virnetsocket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.5.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Cole Robinson March 16, 2016, 11:27 p.m. UTC | #1
On 03/16/2016 07:24 AM, Martin Kletzander wrote:
> On Wed, Mar 16, 2016 at 09:52:31AM +0000, Richard W.M. Jones wrote:

>> On Tue, Mar 15, 2016 at 05:10:48PM -0400, Cole Robinson wrote:

>>> https://bugzilla.redhat.com/show_bug.cgi?id=1271183

>>>

>>> We only wait .5 seconds for the session daemon to start up and present

>>> its socket, which isn't sufficient for many users. Bump up the sleep

>>> interval and retry amount so we wait for a total of 5 seconds.

>>

>> A longer delay is surely better, so ACK from me.

>>

> 

> Unless it's half a minute or 20 seconds or whatever it was before as we

> were getting complaints for that.  ACK from me too.

> 


Thanks, pushed with Christophe's commit message tweak

- Cole

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox

Patch

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index b0d5b1c..d909b94 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -614,7 +614,7 @@  int virNetSocketNewConnectUNIX(const char *path,
     char *lockpath = NULL;
     int lockfd = -1;
     int fd = -1;
-    int retries = 100;
+    int retries = 500;
     virSocketAddr localAddr;
     virSocketAddr remoteAddr;
     char *rundir = NULL;
@@ -707,7 +707,7 @@  int virNetSocketNewConnectUNIX(const char *path,
             daemonLaunched = true;
         }
 
-        usleep(5000);
+        usleep(10000);
     }
 
     localAddr.len = sizeof(localAddr.data);