]> git.ipfire.org Git - thirdparty/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>
Thu, 21 Jan 2016 00:13:32 +0000 (19:13 -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
(cherry picked from commit 2eb7a975756d05a5b54ab4acf60083beb6161ac6)

src/rpc/virnetsocket.c

index 6a51dc840b9134e172940e810257a26995ae0886..b132532be65a83a565791c27ef57387c5727395d 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);
     }