- Devel - libvirt List Archives

Re: [libvirt] [Users] Migration issues with ovirt 3.3
by Dan Kenigsberg 14 Oct '13

14 Oct '13

On Wed, Oct 09, 2013 at 02:42:22PM +0200, Gianluca Cecchi wrote: > On Tue, Oct 8, 2013 at 10:40 AM, Dan Kenigsberg wrote: > > > > >> > >> But migration still fails > >> > > > > It seems like an unrelated failure. I do not know what's blocking > > migration traffic. Could you see if libvirtd.log and qemu logs at source > > and destinaiton have clues? > > > > It seems that on VM.log under qemu of desdt host I have: > ... > -incoming tcp:[::]:49153: Failed to bind socket: Address already in use Is that port really taken (`ss -ntp` should tell by whom)? > > > See all: > - In libvirtd.log of source host > 2013-10-07 23:20:54.471+0000: 1209: debug : > qemuMonitorOpenInternal:751 : QEMU_MONITOR_NEW: mon=0x7fc66412e820 > refs=2 fd=30 > 2013-10-07 23:20:54.472+0000: 1209: warning : > qemuDomainObjEnterMonitorInternal:1136 : This thread seems to be the > async job owner; entering monitor without asking for a nested job is > dangerous > 2013-10-07 23:20:54.472+0000: 1209: debug : > qemuMonitorSetCapabilities:1145 : mon=0x7fc66412e820 > 2013-10-07 23:20:54.472+0000: 1209: debug : qemuMonitorSend:887 : > QEMU_MONITOR_SEND_MSG: mon=0x7fc66412e820 > msg={"execute":"qmp_capabilities","id":"libvirt-1"} > fd=-1 > 2013-10-07 23:20:54.769+0000: 1199: error : qemuMonitorIORead:505 : > Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.769+0000: 1199: debug : qemuMonitorIO:638 : Error > on monitor Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.769+0000: 1199: debug : qemuMonitorIO:672 : > Triggering error callback > 2013-10-07 23:20:54.769+0000: 1199: debug : > qemuProcessHandleMonitorError:351 : Received error on 0x7fc664124fb0 > 'c8again32' > 2013-10-07 23:20:54.769+0000: 1209: debug : qemuMonitorSend:899 : Send > command resulted in error Unable to read from monitor: Connection > reset by peer > 2013-10-07 23:20:54.770+0000: 1199: debug : qemuMonitorIO:638 : Error > on monitor Unable to read from monitor: Connection reset by peer > 2013-10-07 23:20:54.770+0000: 1209: debug : virFileMakePathHelper:1283 > : path=/var/run/libvirt/qemu mode=0777 > 2013-10-07 23:20:54.770+0000: 1199: debug : qemuMonitorIO:661 : > Triggering EOF callback > 2013-10-07 23:20:54.770+0000: 1199: debug : > qemuProcessHandleMonitorEOF:294 : Received EOF on 0x7fc664124fb0 > 'c8again32' > 2013-10-07 23:20:54.770+0000: 1209: debug : qemuProcessStop:3992 : > Shutting down VM 'c8again32' pid=18053 flags=0 > 2013-10-07 23:20:54.771+0000: 1209: error : > virNWFilterDHCPSnoopEnd:2135 : internal error ifname "vnet0" not in > key map > 2013-10-07 23:20:54.782+0000: 1209: debug : virCommandRunAsync:2251 : > About to run /bin/sh -c 'IPT="/usr/sbin/iptables" > $IPT -D libvirt-out -m physdev --physdev-is-bridged --physdev-out > vnet0 -g FO-vnet0 > $IPT -D libvirt-out -m physdev --physdev-out vnet0 -g FO-vnet0 > $IPT -D libvirt-in -m physdev --physdev-in vnet0 -g FI-vnet0 > $IPT -D libvirt-host-in -m physdev --physdev-in vnet0 -g HI-vnet0 > $IPT -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT > $IPT -F FO-vnet0 > $IPT -X FO-vnet0 > $IPT -F FI-vnet0 > $IPT -X FI-vnet0 > $IPT -F HI-vnet0 > $IPT -X HI-vnet0 > IPT="/usr/sbin/ip6tables" > $IPT -D libvirt-out -m physdev --physdev-is-bridged --physdev-out > vnet0 -g FO-vnet0 > $IPT -D libvirt-out -m physdev --physdev-out vnet0 -g FO-vnet0 > $IPT -D libvirt-in -m physdev --physdev-in vnet0 -g FI-vnet0 > $IPT -D libvirt-host-in -m physdev --physdev-in vnet0 -g HI-vnet0 > $IPT -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT > $IPT -F FO-vnet0 > $IPT -X FO-vnet0 > $IPT -F FI-vnet0 > $IPT -X FI-vnet0 > $IPT -F HI-vnet0 > $IPT -X HI-vnet0 > EBT="/usr/sbin/ebtables" > $EBT -t nat -D PREROUTING -i vnet0 -j libvirt-I-vnet0 > $EBT -t nat -D POSTROUTING -o vnet0 -j libvirt-O-vnet0 > EBT="/usr/sbin/ebtables" > collect_chains() > { > for tmp2 in $*; do > for tmp in $($EBT -t nat -L $tmp2 | \ > sed -n "/Bridge chain/,\$ s/.*-j \$[IO]-.*\$/\\1/p"); > do > echo $tmp > collect_chains $tmp > done > done > } > rm_chains() > { > for tmp in $*; do $EBT -t nat -F $tmp; done > for tmp in $*; do $EBT -t nat -X $tmp; done > } > tmp='\'' > '\'' > IFS='\'' '\'''\'' '\''$tmp > chains="$(collect_chains libvirt-I-vnet0 libvirt-O-vnet0)" > $EBT -t nat -F libvirt-I-vnet0 > $EBT -t nat -F libvirt-O-vnet0 > rm_chains $chains > $EBT -t nat -F libvirt-I-vnet0 > $EBT -t nat -X libvirt-I-vnet0 > $EBT -t nat -F libvirt-O-vnet0 > $EBT -t nat -X libvirt-O-vnet0 > ' > 2013-10-07 23:20:54.784+0000: 1209: debug : virCommandRunAsync:2256 : > Command result 0, with PID 18076 > 2013-10-07 23:20:54.863+0000: 1209: debug : virCommandRun:2125 : > Result exit status 255, stdout: '' stderr: 'iptables v1.4.18: goto > 'FO-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'FI-vnet0' is not a chain > Try `iptables -h' or 'iptables --help' for more information. > iptables v1.4.18: goto 'HI-vnet0' is not a chain > > Try `iptables -h' or 'iptables --help' for more information. > iptables: Bad rule (does a matching rule exist in that chain?). > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > iptables: No chain/target/match by that name. > ip6tables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'FO-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'FI-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables v1.4.18: goto 'HI-vnet0' is not a chain > > Try `ip6tables -h' or 'ip6tables --help' for more information. > ip6tables: Bad rule (does a matching rule exist in that chain?). > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > ip6tables: No chain/target/match by that name. > Illegal target name 'libvirt-O-vnet0'. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > Chain 'libvirt-O-vnet0' doesn't exist. > ' > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuMonitorClose:821 : > QEMU_MONITOR_CLOSE: mon=0x7fc66412e820 refs=2 > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuProcessKill:3951 : > vm=c8again32 pid=18053 flags=5 > 2013-10-07 23:20:54.863+0000: 1209: debug : > virProcessKillPainfully:269 : vpid=18053 force=1 > 2013-10-07 23:20:54.863+0000: 1209: debug : qemuDomainCleanupRun:2132 > : driver=0x7fc664024cd0, vm=c8again32 > 2013-10-07 23:20:54.863+0000: 1209: debug : > qemuProcessAutoDestroyRemove:4504 : vm=c8again32 > 2013-10-07 23:20:54.863+0000: 1209: debug : > virQEMUCloseCallbacksUnset:744 : vm=c8again32, > uuid=d54660a2-45ed-41ae-ab99-a6f93ebbdbb1, cb=0x7fc66b6fe570 > 2013-10-07 23:20:54.864+0000: 1209: error : > virPortAllocatorRelease:174 : port 0 must be in range (5900, 65535) > 2013-10-07 23:20:54.865+0000: 1209: debug : qemuDomainObjEndJob:1070 : > Stopping job: none (async=migration in) > 2013-10-07 23:20:54.865+0000: 1209: debug : > qemuDomainObjEndAsyncJob:1088 : Stopping async job: migration in > 2013-10-07 23:20:54.865+0000: 1199: debug : > qemuProcessHandleMonitorEOF:306 : Domain 0x7fc664124fb0 is not active, > ignoring EOF > Caught Segmentation violation dumping internal log buffer: This line one seems ominous. Can libvir-list help with it?

4 8

[libvirt] [PATCH]lxc: fix an improper comment in lxc_process
by Chen Hanxiao 14 Oct '13

14 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Fix an improper comment when libvirt has released all resources for lxc. Then original comment says "stopped" rather than "released". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d07ff13..7746c9b 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -217,7 +217,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virSystemdTerminateMachine(vm->def->name, "lxc", true); - /* now that we know it's stopped call the hook if present */ + /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); -- 1.8.2.1

2 3

[libvirt] Guide to view the libvirt source.
by cooldharma06 14 Oct '13

14 Oct '13

hi all, i am new to this libvirt. Any guide or reference is available to know more things libvirt (individual programs). because it will give me some idea to get about the libvirt and its corresponding programs. If there is available means please guide and share me. i want to give my contribution to this community. Lot of thanks in advance. Regards, cooldharma06.

3 2

[libvirt] [PATCH 0/3] Improve LXC startup error reporting
by Daniel P. Berrange 14 Oct '13

14 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> LXC has long suffered from pretty poor error reporting of failures at startup. This series addresses those problems. Daniel P. Berrange (3): Fix exit status of lxc controller Improve error reporting with LXC controller Don't ignore all dbus connection errors src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_process.c | 31 +++++++++++++++++++++++++------ src/nwfilter/nwfilter_driver.c | 5 +++-- src/util/virdbus.c | 22 +++++++++++++++++++--- src/util/virsystemd.c | 6 ++++-- 5 files changed, 52 insertions(+), 14 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] rpc: Retrieve peer PID via new getsockopt() for Mac
by Doug Goldstein 13 Oct '13

13 Oct '13

While LOCAL_PEERCRED on the BSDs does not return the pid information of the peer, Mac OS X 10.8 added LOCAL_PEERPID to retrieve the pid so we should use that when its available to get that information. --- src/rpc/virnetsocket.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8cdfa6..09a0a12 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1195,12 +1195,26 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } - /* PID and process creation time are not supported on BSDs */ + /* PID and process creation time are not supported on BSDs by + * LOCAL_PEERCRED. + */ *pid = -1; *timestamp = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; +# ifdef LOCAL_PEERPID + /* Exists on Mac OS X 10.8 for retrieving the peer's PID */ + cr_len = sizeof(*pid); + + if (getsockopt(sock->fd, VIR_SOL_PEERCRED, LOCAL_PEERPID, pid, &cr_len) < 0) { + virReportSystemError(errno, "%s", + _("Failed to get client socket PID")); + virObjectUnlock(sock); + return -1; + } +# endif + virObjectUnlock(sock); return 0; } -- 1.8.1.5

2 2

[libvirt] PATCH: better error checking for LOCAL_PEERCRED
by Brian Candler 13 Oct '13

13 Oct '13

I was debugging libvirt with OSX today, and got as far as finding the problem with LOCAL_PEERCRED, then googled this only to find that Ryota Ozaki had fixed the problems a few days ago! However you still may find the following patch useful. It tightens up the checking in the LOCAL_PEERCRED block, and in particular fixes the unlocking of the socket in the error return path for invalid groups, by using the same logic from SO_PEERCRED - have a 'goto cleanup' in all return paths. (Detail: I found that when getsockopt was being called with SOL_SOCKET, cr_ngroups was typically <0, probably because it was uninitialised. However once the check for this was tightened, it hung because the socket wasn't being unlocked on return. So better to (a) initialise it to a negative value anyway, and (b) fix the return path) However I have not checked that NGROUPS is defined on other BSD-like systems. Regards, Brian Candler. --- src/rpc/virnetsocket.c.orig 2013-10-10 22:37:49.000000000 +0100 +++ src/rpc/virnetsocket.c 2013-10-12 22:51:57.000000000 +0100 @@ -1157,8 +1157,10 @@ { struct xucred cr; socklen_t cr_len = sizeof(cr); + int ret = -1; virObjectLock(sock); + cr.cr_ngroups = -1; # if defined(__APPLE__) if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) { # else @@ -1166,20 +1168,19 @@ # endif virReportSystemError(errno, "%s", _("Failed to get client socket identity")); - virObjectUnlock(sock); - return -1; + goto cleanup; } if (cr.cr_version != XUCRED_VERSION) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity")); - return -1; + goto cleanup; } - if (cr.cr_ngroups == 0) { + if (cr.cr_ngroups <= 0 || cr.cr_ngroups > NGROUPS) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity groups")); - return -1; + goto cleanup; } /* PID and process creation time are not supported on BSDs */ @@ -1188,8 +1189,11 @@ *uid = cr.cr_uid; *gid = cr.cr_gid; + ret = 0; + +cleanup: virObjectUnlock(sock); - return 0; + return ret; } #else int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,

1 0

[libvirt] QEMU GSoC featured on Google Open Source Blog
by Stefan Hajnoczi 12 Oct '13

12 Oct '13

Stephanie Taylor at the Google Open Source Blog has helped us publish a post that features two projects from this year's Google Summer of Code: http://google-opensource.blogspot.de/2013/10/google-summer-of-code-veteran-… Mike and Osier contributed summaries of the "QEMU Integrated Copy/Paste" and "Libvirt API to query IP addresses for given domain" projects. Stefan

1 0

[libvirt] [BUG] libvirtd on destination crash frequently while migrating vms concurrently
by Wangyufei (A) 12 Oct '13

12 Oct '13

Hello, I found a problem that libvirtd on destination crash frequently while migrating vms concurrently. For example, if I migrate 10 vms concurrently ceaselessly, then after about 30 minutes the libvirtd on destination will crash. So I analyzed and found two bugs during migration process. First, during migration prepare phase on destination, libvirtd assigns ports to qemu to be startd on destination. But the port increase operation is not aomic, so there's a chance that multi vms get the same port, and only the first one can start successfully, others will fail to start. I've applied a patch to solve this bug, and I test it, it works well. If only this bug exists, libvirtd will not crash. The second bug is fatal. Second, I found the libvirtd crash because of segment fault which is produced by accessing vm released. Apparently it's caused by multi-thread operation, thread A access vm data which has released by thread B. At last I proved my thought right. Step 1. Because of bug one, the port is already occupied, so qemu on destination failed to start and sent a HANGUP signal to libvirtd, then libvirtd received this VIR_EVENT_HANDLE_HANGUP event, thread A dealing with events called qemuProcessHandleMonitorEOF as following: #0 qemuProcessHandleMonitorEOF (mon=0x7f4dcd9c3130, vm=0x7f4dcd9c9780) at qemu/qemu_process.c:399 #1 0x00007f4dc18d9e87 in qemuMonitorIO (watch=68, fd=27, events=8, opaque=0x7f4dcd9c3130) at qemu/qemu_monitor.c:668 #2 0x00007f4dccae6604 in virEventPollDispatchHandles (nfds=18, fds=0x7f4db4017e70) at util/vireventpoll.c:500 #3 0x00007f4dccae7ff2 in virEventPollRunOnce () at util/vireventpoll.c:646 #4 0x00007f4dccae60e4 in virEventRunDefaultImpl () at util/virevent.c:273 #5 0x00007f4dccc40b25 in virNetServerRun (srv=0x7f4dcd8d26b0) at rpc/virnetserver.c:1106 #6 0x00007f4dcd6164c9 in main (argc=3, argv=0x7fff8d8f9f88) at libvirtd.c:1518 static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { ...... /* deleted flag is still false now, so we pass through to qemuProcessHandleMonitorEOF */ if (eventLoop.handles[i].deleted) { EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); continue; } Step 2: Thread B dealing with migration on destination set deleted flag in virEventPollRemoveHandle as following: #0 virEventPollRemoveHandle (watch=74) at util/vireventpoll.c:176 #1 0x00007f4dccae5e6f in virEventRemoveHandle (watch=74) at util/virevent.c:97 #2 0x00007f4dc18d8ca8 in qemuMonitorClose (mon=0x7f4dbc030910) at qemu/qemu_monitor.c:831 #3 0x00007f4dc18bec63 in qemuProcessStop (driver=0x7f4dcd9bd400, vm=0x7f4dbc00ed20, reason=VIR_DOMAIN_SHUTOFF_FAILED, flags=0) at qemu/qemu_process.c:4302 #4 0x00007f4dc18c1a83 in qemuProcessStart (conn=0x7f4dbc031020, driver=0x7f4dcd9bd400, vm=0x7f4dbc00ed20, migrateFrom=0x7f4dbc01af90 "tcp:[::]:49152", stdin_fd=-1, stdin_path=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, flags=6) at qemu/qemu_process.c:4145 #5 0x00007f4dc18cc688 in qemuMigrationPrepareAny (driver=0x7f4dcd9bd400, Step 3: Thread B cleanup vm in qemuMigrationPrepareAny after qemuProcessStart failed. #0 virDomainObjDispose (obj=0x7f4dcd9c9780) at conf/domain_conf.c:2009 #1 0x00007f4dccb0ccd9 in virObjectUnref (anyobj=0x7f4dcd9c9780) at util/virobject.c:266 #2 0x00007f4dccb42340 in virDomainObjListRemove (doms=0x7f4dcd9bd4f0, dom=0x7f4dcd9c9780) at conf/domain_conf.c:2342 #3 0x00007f4dc189ac33 in qemuDomainRemoveInactive (driver=0x7f4dcd9bd400, vm=0x7f4dcd9c9780) at qemu/qemu_domain.c:1993 #4 0x00007f4dc18ccad5 in qemuMigrationPrepareAny (driver=0x7f4dcd9bd400, Step 4: Thread A access priv which is released by thread B before, then libvirtd crash, bomb! static void qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { virQEMUDriverPtr driver = qemu_driver; virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; int stopReason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; const char *auditReason = "shutdown"; VIR_DEBUG("Received EOF on %p '%s'", vm, vm->def->name); virObjectLock(vm); priv = vm->privateData; (gdb) p priv $1 = (qemuDomainObjPrivatePtr) 0x0 if (priv->beingDestroyed) { At last if anything bad happened to make qemuProcessStart failed during migration on destination, we'll be in the big trouble that accessing some memory freed. I didn't find any locks or flags exist could stop this happening. Please help me out, thanks a lot. Best Regards, -WangYufei

2 4

[libvirt] [PATCH 0/3] Fix scalability of LXC containers
by Daniel P. Berrange 11 Oct '13

11 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since we switched to use systemd for creating cgroups we have a scalability problem with LXC out of the box. Only ~230 containers can be created before we hit the default dbus-daemon connection limit. This series makes libvirt_lxc close its dbus connection once the guest has started, avoiding the problem. Daniel P. Berrange (3): Allow use of a private dbus bus connection Add a method for closing the dbus system bus connection Make LXC controller use a private dbus connection & close it src/Makefile.am | 1 + src/libvirt_private.syms | 2 ++ src/lxc/lxc_controller.c | 9 +++++++++ src/util/virdbus.c | 28 +++++++++++++++++++++++++++- src/util/virdbus.h | 3 +++ 5 files changed, 42 insertions(+), 1 deletion(-) -- 1.8.3.1

2 8

[libvirt] [PATCH] Fix flaw in detecting log format
by Daniel P. Berrange 11 Oct '13

11 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The log message regex has been [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}\+[0-9]{4}: [0-9]+: debug|info|warning|error : The precedence of '|' is high though, so this is equivalent to matching [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}\+[0-9]{4}: [0-9]+: debug Or info Or warning Or error : Which is clearly not what it should have done. This caused the code to skip over things which are not log messages. The solution is to simply add brackets. A test case is also added to validate correctness. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/util/virlog.c | 5 +++- tests/Makefile.am | 5 ++++ tests/virlogtest.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tests/virlogtest.c diff --git a/.gitignore b/.gitignore index b5824dc..db5abcd 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,7 @@ /tests/virkeycodetest /tests/virkeyfiletest /tests/virlockspacetest +/tests/virlogtest /tests/virnet*test /tests/virportallocatortest /tests/virshtest diff --git a/src/util/virlog.c b/src/util/virlog.c index 7ee5117..cc5032f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -83,7 +83,7 @@ static regex_t *virLogRegex = NULL; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" #define VIR_LOG_TIME_REGEX "[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}\\+[0-9]{4}" #define VIR_LOG_PID_REGEX "[0-9]+" -#define VIR_LOG_LEVEL_REGEX "debug|info|warning|error" +#define VIR_LOG_LEVEL_REGEX "(debug|info|warning|error)" #define VIR_LOG_REGEX \ VIR_LOG_DATE_REGEX " " VIR_LOG_TIME_REGEX ": " \ @@ -1623,6 +1623,9 @@ virLogSetFromEnv(void) { char *debugEnv; + if (virLogInitialize() < 0) + return; + debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv) virLogParseDefaultPriority(debugEnv); diff --git a/tests/Makefile.am b/tests/Makefile.am index 3eda522..250cd8c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -126,6 +126,7 @@ test_programs = virshtest sockettest \ viridentitytest \ virkeycodetest \ virlockspacetest \ + virlogtest \ virstringtest \ virportallocatortest \ sysinfotest \ @@ -716,6 +717,10 @@ virlockspacetest_SOURCES = \ virlockspacetest.c testutils.h testutils.c virlockspacetest_LDADD = $(LDADDS) +virlogtest_SOURCES = \ + virlogtest.c testutils.h testutils.c +virlogtest_LDADD = $(LDADDS) + virportallocatortest_SOURCES = \ virportallocatortest.c testutils.h testutils.c virportallocatortest_LDADD = $(LDADDS) diff --git a/tests/virlogtest.c b/tests/virlogtest.c new file mode 100644 index 0000000..dfe0f75 --- /dev/null +++ b/tests/virlogtest.c @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "testutils.h" + +#include "virlog.h" + +struct testLogMatchData { + const char *str; + bool res; +}; + +static int +testLogMatch(const void *opaque) +{ + const struct testLogMatchData *data = opaque; + + bool got = virLogProbablyLogMessage(data->str); + if (got != data->res) { + fprintf(stderr, "Expected '%d' but got '%d' for '%s'\n", + data->res, got, data->str); + return -1; + } + return 0; +} + + +static int +mymain(void) +{ + int ret = 0; + +#define TEST_LOG_MATCH(str, res) \ + do { \ + struct testLogMatchData data = { \ + str, res \ + }; \ + if (virtTestRun("testLogMatch " # str, testLogMatch, &data) < 0) \ + ret = -1; \ + } while (0) + + TEST_LOG_MATCH("2013-10-11 15:43:43.866+0000: 28302: info : libvirt version: 1.1.3", true); + + TEST_LOG_MATCH("libvirt: error : cannot execute binary /usr/libexec/libvirt_lxc: No such file or directory", false); + + return ret; +} + +VIRT_TEST_MAIN(mymain) -- 1.8.3.1

2 1