Fix qemu:///session connect race failures (bz #1271183)
driver: log missing modules as INFO, not WARN (bz #1274849)
This commit is contained in:
parent
c76aa1c80f
commit
d2399d7bdf
|
@ -0,0 +1,37 @@
|
||||||
|
From: Cole Robinson <crobinso@redhat.com>
|
||||||
|
Date: Tue, 15 Mar 2016 17:04:32 -0400
|
||||||
|
Subject: [PATCH] rpc: wait longer for session daemon to start up
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1271183
|
||||||
|
|
||||||
|
We only wait 0.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.0 seconds.
|
||||||
|
|
||||||
|
(cherry picked from commit ca0c06f4008154de55e0b3109885facd0bf02d32)
|
||||||
|
---
|
||||||
|
src/rpc/virnetsocket.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
|
||||||
|
index 2ee4b6e..275f1f5 100644
|
||||||
|
--- a/src/rpc/virnetsocket.c
|
||||||
|
+++ b/src/rpc/virnetsocket.c
|
||||||
|
@@ -542,7 +542,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;
|
||||||
|
@@ -635,7 +635,7 @@ int virNetSocketNewConnectUNIX(const char *path,
|
||||||
|
daemonLaunched = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
- usleep(5000);
|
||||||
|
+ usleep(10000);
|
||||||
|
}
|
||||||
|
|
||||||
|
localAddr.len = sizeof(localAddr.data);
|
|
@ -0,0 +1,27 @@
|
||||||
|
From: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
|
||||||
|
Date: Thu, 17 Mar 2016 20:02:20 +0100
|
||||||
|
Subject: [PATCH] driver: log missing modules as INFO, not WARN
|
||||||
|
|
||||||
|
Missing modules is a common expected scenario for most libvirt usage on
|
||||||
|
RPM distributions like Fedora, so it doesn't really warrant logging at
|
||||||
|
WARN level. Use INFO instead
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1274849
|
||||||
|
(cherry picked from commit 9a0c7f5f834185db9017c34aabc03ad99cf37bed)
|
||||||
|
---
|
||||||
|
src/driver.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/driver.c b/src/driver.c
|
||||||
|
index db03438..f926fe4 100644
|
||||||
|
--- a/src/driver.c
|
||||||
|
+++ b/src/driver.c
|
||||||
|
@@ -62,7 +62,7 @@ virDriverLoadModule(const char *name)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
if (access(modfile, R_OK) < 0) {
|
||||||
|
- VIR_WARN("Module %s not accessible", modfile);
|
||||||
|
+ VIR_INFO("Module %s not accessible", modfile);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
12
libvirt.spec
12
libvirt.spec
|
@ -371,7 +371,7 @@
|
||||||
Summary: Library providing a simple virtualization API
|
Summary: Library providing a simple virtualization API
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Version: 1.2.13.2
|
Version: 1.2.13.2
|
||||||
Release: 2%{?dist}%{?extra_release}
|
Release: 3%{?dist}%{?extra_release}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
|
@ -397,8 +397,12 @@ Patch0006: 0006-rpc-socket-Explicitly-error-if-we-exceed-retry-count.patch
|
||||||
Patch0007: 0007-rpc-socket-Don-t-repeatedly-attempt-to-launch-daemon.patch
|
Patch0007: 0007-rpc-socket-Don-t-repeatedly-attempt-to-launch-daemon.patch
|
||||||
# Fix parallel VM start/top svirt errors on kernel/initrd (bz #1269975)
|
# Fix parallel VM start/top svirt errors on kernel/initrd (bz #1269975)
|
||||||
Patch0008: 0008-security-Do-not-restore-kernel-and-initrd-labels.patch
|
Patch0008: 0008-security-Do-not-restore-kernel-and-initrd-labels.patch
|
||||||
|
# Fix qemu:///session connect race failures (bz #1271183)
|
||||||
|
Patch0009: 0009-rpc-wait-longer-for-session-daemon-to-start-up.patch
|
||||||
|
# driver: log missing modules as INFO, not WARN (bz #1274849)
|
||||||
|
Patch0010: 0010-driver-log-missing-modules-as-INFO-not-WARN.patch
|
||||||
# polkit: Allow password-less access for 'libvirt' group (bz #957300)
|
# polkit: Allow password-less access for 'libvirt' group (bz #957300)
|
||||||
Patch0009: 0009-polkit-Allow-password-less-access-for-libvirt-group.patch
|
Patch0011: 0011-polkit-Allow-password-less-access-for-libvirt-group.patch
|
||||||
|
|
||||||
%if %{with_libvirtd}
|
%if %{with_libvirtd}
|
||||||
Requires: libvirt-daemon = %{version}-%{release}
|
Requires: libvirt-daemon = %{version}-%{release}
|
||||||
|
@ -2312,6 +2316,10 @@ exit 0
|
||||||
%doc examples/systemtap
|
%doc examples/systemtap
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 17 2016 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-3
|
||||||
|
- Fix qemu:///session connect race failures (bz #1271183)
|
||||||
|
- driver: log missing modules as INFO, not WARN (bz #1274849)
|
||||||
|
|
||||||
* Wed Jan 20 2016 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-2
|
* Wed Jan 20 2016 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-2
|
||||||
- Fix XML validation with qemu commandline passthrough (bz #1292131)
|
- Fix XML validation with qemu commandline passthrough (bz #1292131)
|
||||||
- Fix crash in libvirt_leasehelper (bz #1202350)
|
- Fix crash in libvirt_leasehelper (bz #1202350)
|
||||||
|
|
Loading…
Reference in New Issue