]> xenbits.xensource.com Git - libvirt.git/commitdiff
rpc: socket: Don't repeatedly attempt to launch daemon
authorCole Robinson <crobinso@redhat.com>
Tue, 12 Jan 2016 01:13:38 +0000 (20:13 -0500)
committerCole Robinson <crobinso@redhat.com>
Tue, 12 Jan 2016 15:45:45 +0000 (10:45 -0500)
On every socket connect(2) attempt we were re-launching session
libvirtd, up to 100 times in 5 seconds.

This understandably caused some weird load races and intermittent
qemu:///session startup failures

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

src/rpc/virnetsocket.c

index 35be184ede28fcab2268ada37296d23c565e98fb..b0d5b1cce83d29024469a58d5be9e393c665941d 100644 (file)
@@ -619,6 +619,7 @@ int virNetSocketNewConnectUNIX(const char *path,
     virSocketAddr remoteAddr;
     char *rundir = NULL;
     int ret = -1;
+    bool daemonLaunched = false;
 
     VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon,
         NULLSTR(binary));
@@ -699,8 +700,12 @@ int virNetSocketNewConnectUNIX(const char *path,
             goto cleanup;
         }
 
-        if (virNetSocketForkDaemon(binary) < 0)
-            goto cleanup;
+        if (!daemonLaunched) {
+            if (virNetSocketForkDaemon(binary) < 0)
+                goto cleanup;
+
+            daemonLaunched = true;
+        }
 
         usleep(5000);
     }