- Devel - libvirt List Archives

[libvirt] [PATCH] logging: ensure virtlogd rollover takes priority over logrotate
by Daniel P. Berrangé 09 Jul '19

09 Jul '19

The virtlogd config is set to rollover logs every 2 MB. Normally a logrotate config file is also installed to handle cases where virtlogd is disabled. This is set to rollover weekly with no size constraint. As a result logrotate can interfere with virtlogd's, rolling over files that virtlogd has already taken care of. This changes logrotate configs to rollover based on a max size constraint of 2 MB + 1 byte. When virtlogd is running the log files will never get this large, making logrotate a no-op. If the user changes the size in virtlogd's config to something larger, they are responsible for also changing the logrotate config suitably. The LXC driver doesn't use virtlogd, but its logrotate config is altered to match the QEMU driver logrotate, just for the sake of consistency. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/logging/virtlogd.conf | 6 ++++++ src/remote/libvirtd.lxc.logrotate.in | 2 +- src/remote/libvirtd.qemu.logrotate.in | 12 +++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index 72da7f0705..bc41edbc6b 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -90,6 +90,12 @@ #admin_max_clients = 5 # Maximum file size before rolling over. Defaults to 2 MB +# +# Beware that a logrotate config file might be installed too, +# to handle cases where virtlogd is disabled. To ensure that +# the logrotate config is a no-op when virtlogd is running, +# make sure that max_size here is smaller than size listed +# in the logrotate config. #max_size = 2097152 # Maximum number of backup files to keep. Defaults to 3, diff --git a/src/remote/libvirtd.lxc.logrotate.in b/src/remote/libvirtd.lxc.logrotate.in index 2bb9dfba12..b88dabb58e 100644 --- a/src/remote/libvirtd.lxc.logrotate.in +++ b/src/remote/libvirtd.lxc.logrotate.in @@ -1,5 +1,5 @@ @localstatedir@/log/libvirt/lxc/*.log { - weekly + size 2097153 missingok rotate 4 compress diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in index cdb399ef23..9b9db716ab 100644 --- a/src/remote/libvirtd.qemu.logrotate.in +++ b/src/remote/libvirtd.qemu.logrotate.in @@ -1,8 +1,14 @@ @localstatedir@/log/libvirt/qemu/*.log { - weekly + # The QEMU driver is configured to use virtlogd by + # default, which will perform log rollover. + # This logrotate config is still installed for cases + # where the user has switched off virtlogd. + # + # If virtlogd is active, ensure that size here is + # larger than 'max_size' in the virtlogd config + # so that logrotate becomes a no-op + size 2097153 missingok rotate 4 - compress - delaycompress copytruncate } -- 2.21.0

2 1

[libvirt] [PATCH] util: assume modern CPU_ALLOC macros always exist
by Daniel P. Berrangé 09 Jul '19

09 Jul '19

Support for the modern CPU_ALLOC macros was added 10 years ago in commit a73cd93b2428adbbc62bb919b6cf5ffd27728040 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Mon Nov 16 16:08:29 2009 +0000 Alternate CPU affinity impl to cope with NR_CPUS > 1024 This is long enough that we can assume it always exists and drop the back compat code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virprocess.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f2533f639f..66834d37d3 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -422,8 +422,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; VIR_DEBUG("Set process affinity on %lld", (long long)pid); -# ifdef CPU_ALLOC - /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; size_t masklen; cpu_set_t *mask; @@ -462,22 +460,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) return -1; } CPU_FREE(mask); -# else - /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */ - cpu_set_t mask; - - CPU_ZERO(&mask); - for (i = 0; i < virBitmapSize(map); i++) { - if (virBitmapIsBitSet(map, i)) - CPU_SET(i, &mask); - } - - if (sched_setaffinity(pid, sizeof(mask), &mask) < 0) { - virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); - return -1; - } -# endif return 0; } @@ -491,7 +473,6 @@ virProcessGetAffinity(pid_t pid) size_t ncpus; virBitmapPtr ret = NULL; -# ifdef CPU_ALLOC /* 262144 cpus ought to be enough for anyone */ ncpus = 1024 << 8; masklen = CPU_ALLOC_SIZE(ncpus); @@ -503,14 +484,6 @@ virProcessGetAffinity(pid_t pid) } CPU_ZERO_S(masklen, mask); -# else - ncpus = 1024; - if (VIR_ALLOC(mask) < 0) - return NULL; - - masklen = sizeof(*mask); - CPU_ZERO(mask); -# endif if (sched_getaffinity(pid, masklen, mask) < 0) { virReportSystemError(errno, @@ -522,22 +495,13 @@ virProcessGetAffinity(pid_t pid) goto cleanup; for (i = 0; i < ncpus; i++) { -# ifdef CPU_ALLOC /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) ignore_value(virBitmapSetBit(ret, i)); -# else - if (CPU_ISSET(i, mask)) - ignore_value(virBitmapSetBit(ret, i)); -# endif } cleanup: -# ifdef CPU_ALLOC CPU_FREE(mask); -# else - VIR_FREE(mask); -# endif return ret; } -- 2.21.0

2 2

[libvirt] [PATCH] libxl_driver: Drop needless variable
by Michal Privoznik 09 Jul '19

09 Jul '19

The @oldDef variable in libxlAddDom0() is not used really. Drop it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7c236383e4..731700ded6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -606,7 +606,6 @@ libxlAddDom0(libxlDriverPrivatePtr driver) libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; - virDomainDefPtr oldDef = NULL; libxl_dominfo d_info; unsigned long long maxmem; int ret = -1; @@ -636,7 +635,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver) if (!(vm = virDomainObjListAdd(driver->domains, def, driver->xmlopt, 0, - &oldDef))) + NULL))) goto cleanup; def = NULL; @@ -657,7 +656,6 @@ libxlAddDom0(libxlDriverPrivatePtr driver) cleanup: libxl_dominfo_dispose(&d_info); virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; -- 2.21.0

2 1

[libvirt] [PATCH] maint: Typo fix for whether
by Eric Blake 09 Jul '19

09 Jul '19

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under trivial rule. src/driver.h | 4 ++-- docs/news-2014.html.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver.h b/src/driver.h index 3fcea0d629..898fb96df4 100644 --- a/src/driver.h +++ b/src/driver.h @@ -78,9 +78,9 @@ typedef struct _virConnectDriver virConnectDriver; typedef virConnectDriver *virConnectDriverPtr; struct _virConnectDriver { - /* Wether driver permits a server in the URI */ + /* Whether driver permits a server in the URI */ bool localOnly; - /* Wether driver needs a server in the URI */ + /* Whether driver needs a server in the URI */ bool remoteOnly; /* * NULL terminated list of supported URI schemes. diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in index 91a4f2f26f..2dbbe070de 100644 --- a/docs/news-2014.html.in +++ b/docs/news-2014.html.in @@ -2041,7 +2041,7 @@ build: avoid compiler warning on shadowed name (Jean-Baptiste Rouault), tests: link against libxml2 (Guido Günther), tests: build viridentitytest only WITH_ATTR. (Jincheng Miao), - maint: Correctly detect wether "gluster" cli tool is accessible (Peter Krempa), + maint: Correctly detect whether "gluster" cli tool is accessible (Peter Krempa), libvirt-guests: avoid bashism (Guido Günther), Use the force flag for mkfs -t xfs (Ján Tomko) </li> -- 2.20.1

1 0

[libvirt] [PATCH] tests: Add getuid() to virnetdevbandwidthmock
by Andrea Bolognani 09 Jul '19

09 Jul '19

When only geteuid() is mocked, the test crashes on Debian 10. Fatal: failed to reset uid: No such file or directory Program received signal SIGABRT, Aborted. __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 50 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) t a a bt Thread 1 (Thread 0x7ffff3b3e080 (LWP 12003)): #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007ffff7798535 in __GI_abort () at abort.c:79 #2 0x00007ffff485ca20 in _gcry_logv (level=level@entry=40, fmt=fmt@entry=0x7ffff4929126 "failed to reset uid: %s\n", arg_ptr=arg_ptr@entry=0x7fffffffe4a0) at ../../src/misc.c:142 #3 0x00007ffff485cd61 in _gcry_log_fatal (fmt=fmt@entry=0x7ffff4929126 "failed to reset uid: %s\n") at ../../src/misc.c:218 #4 0x00007ffff48639d1 in lock_pool_pages (n=<optimized out>, p=<optimized out>) at ../../src/secmem.c:340 #5 _gcry_secmem_init_internal (n=<optimized out>) at ../../src/secmem.c:563 #6 0x00007ffff4863d78 in _gcry_secmem_init (n=4096) at ../../src/secmem.c:581 #7 0x00007ffff485e4e6 in _gcry_vcontrol (cmd=<optimized out>, arg_ptr=arg_ptr@entry=0x7fffffffe5e0) at ../../src/global.c:506 #8 0x00007ffff485a789 in gcry_control (cmd=cmd@entry=GCRYCTL_INIT_SECMEM) at ../../src/visibility.c:79 #9 0x00007ffff71af10f in ssh_crypto_init () at ./src/libgcrypt.c:621 #10 0x00007ffff7193796 in _ssh_init (constructor=constructor@entry=1) at ./src/init.c:79 #11 0x00007ffff71834de in libssh_constructor () at ./src/init.c:116 #12 0x00007ffff7fe437a in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe778, env=env@entry=0x7fffffffe788) at dl-init.c:72 #13 0x00007ffff7fe4476 in call_init (env=0x7fffffffe788, argv=0x7fffffffe778, argc=1, l=<optimized out>) at dl-init.c:30 #14 _dl_init (main_map=0x7ffff7ffe190, argc=1, argv=0x7fffffffe778, env=0x7fffffffe788) at dl-init.c:119 #15 0x00007ffff7fd60ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2 #16 0x0000000000000001 in ?? () #17 0x00007fffffffea26 in ?? () #18 0x0000000000000000 in ?? () Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/virnetdevbandwidthmock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/virnetdevbandwidthmock.c b/tests/virnetdevbandwidthmock.c index cb48933447..f0c6b22c5f 100644 --- a/tests/virnetdevbandwidthmock.c +++ b/tests/virnetdevbandwidthmock.c @@ -24,3 +24,8 @@ uid_t geteuid(void) { return 0; } + +uid_t getuid(void) +{ + return 0; +} -- 2.21.0

2 3

[libvirt] [PATCHv2] Do not keep empty log files for deleted domains
by Jan Zerebecki 09 Jul '19

09 Jul '19

With logrotates copytruncate when e.g. domain1 doesn't exist anymore /var/log/libvirt/qemu/domain1.log will still exist after rotation even though it will never be written to. When new domain names keep getting used this leads to a lot of empty logfiles. This may lead to slowdown or lack of free disk space / inodes. Fix this by replacing copytruncate with the apropriate postrotate command to reopen log files. Thus after the apropriate time log files for deleted domains will be gone. This also has the advantage that the chance for loss of a few lines during copytruncate is gone. This only fixes the issue for qemu domains, others still have the same problem unfixed. Signed-off-by: Jan Zerebecki <jan.suse(a)zerebecki.de> --- v2: drop changes to other logrotate confis src/remote/libvirtd.qemu.logrotate.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in index cdb399ef23..95407cec1a 100644 --- a/src/remote/libvirtd.qemu.logrotate.in +++ b/src/remote/libvirtd.qemu.logrotate.in @@ -4,5 +4,7 @@ rotate 4 compress delaycompress - copytruncate + postrotate + /usr/bin/killall -USR1 virtlogd + endscript } -- 2.20.1

3 6

[libvirt] [PATCH v4 00/25] Fix and enable owner remembering
by Michal Privoznik 09 Jul '19

09 Jul '19

This is meant for next release to have the most time possible for testing. Some of the patches were ACKed in v3 already but since they don't make sense on their own I haven't pushed them. v4 of: https://www.redhat.com/archives/libvir-list/2019-March/msg01948.html As usual, you can find (not only these) patches on my github: https://github.com/zippy2/libvirt branch xattr_fixes_v4 diff to v3: - Some new patches (qemusecuritytest and qemusecuritymock) - Some other fixes raised by Cole in review of v3 (like double error reporting and others) - Remembering is done only for paths that cannot be shared between domains. This renders refcounting needless because the refcounter can't ever be greater than one. Nevertheless, I'm keeping it in because in the long run I might come up with a solution to the problem of shared resources and having refcounters might help. Michal Prívozník (25): qemusecuritymock: Mock virProcessRunInFork qemusecuritymock: Fix bit arithmetic qemusecuritymock: Actually set error on failure qemusecuritymock: Introduce and use freePaths() qemusecuritytest: Drop unused variable qemusecuritytest: Use AUTOFREE/AUTOUNREF qemusecuritytest: Fix capabilities loading tools: Slightly rework libvirt_recover_xattrs.sh virSecuritySELinuxRestoreAllLabel: Print @migrated in the debug message too virfile: Make virFileGetXAttr report errors virFileSetXAttr: Report error on failure virFileRemoveXAttr: Report error on failure security: Don't skip label restore on file systems lacking XATTRs security: Document @restore member of transaction list security_dac: Allow caller to suppress owner remembering security_selinux: Allow caller to suppress owner remembering qemusecuritymock: Allow some paths to be not restored security: Don't remember owner for shared resources security: Introduce virSecurityManagerMoveImageMetadata security_util: Introduce virSecurityMoveRememberedLabel security_dac: Implement virSecurityManagerMoveImageMetadata security_selinux: Implement virSecurityManagerMoveImageMetadata qemu_security: Implement qemuSecurityMoveImageMetadata qemu: Move image security metadata on snapshot activity Revert "qemu: Temporary disable owner remembering" docs/news.xml | 13 ++ src/libvirt_private.syms | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_blockjob.c | 6 + src/qemu/qemu_conf.c | 4 + src/qemu/qemu_driver.c | 17 +- src/qemu/qemu_security.c | 19 +++ src/qemu/qemu_security.h | 5 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 171 +++++++++++++++---- src/security/security_driver.h | 5 + src/security/security_manager.c | 39 +++++ src/security/security_manager.h | 4 + src/security/security_nop.c | 10 ++ src/security/security_selinux.c | 263 ++++++++++++++++++++--------- src/security/security_stack.c | 20 +++ src/security/security_util.c | 73 +++++++- src/security/security_util.h | 5 + src/util/virfile.c | 78 +++++++-- src/util/virfile.h | 5 + src/util/virprocess.h | 3 +- tests/qemusecuritymock.c | 76 +++++++-- tests/qemusecuritytest.c | 146 ++++++++++------ tests/qemusecuritytest.h | 4 +- tools/libvirt_recover_xattrs.sh | 50 +++--- 26 files changed, 802 insertions(+), 223 deletions(-) -- 2.21.0

4 64

[libvirt] [PATCH Rust v2 1/6] ci workaround when running integration tests
by Sahid Orentino Ferdjaoui 09 Jul '19

09 Jul '19

Due to an issue fixed in libvirt master we should not consider running integration tests in parallel. https://www.redhat.com/archives/libvir-list/2019-July/msg00287.html Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c52f745..54f3c24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,7 @@ install: script: - cargo test --verbose - - cargo test --verbose -- --ignored + # Due to an issue fixed in master we should not consider running + # integration tests in parallel. + # see: https://www.redhat.com/archives/libvir-list/2019-July/msg00287.html + - cargo test --verbose -- --ignored --test-threads=1 -- 2.17.1

2 11

[libvirt] [PATCH] po: Drop src/xenconfig/xen_sxpr.c from POTFILES
by Peter Krempa 09 Jul '19

09 Jul '19

Commit 2f1c909991291b40 forgot this change. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. po/POTFILES | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES b/po/POTFILES index 23f24ed76f..ab582ffbe9 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -290,7 +290,6 @@ src/vz/vz_utils.h src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c src/xenconfig/xen_common.c -src/xenconfig/xen_sxpr.c src/xenconfig/xen_xl.c src/xenconfig/xen_xm.c tests/virpolkittest.c -- 2.21.0

1 0

[libvirt] [jenkins-ci PATCH 0/5] guests: Add Debian 10
by Andrea Bolognani 09 Jul '19

09 Jul '19

It was released, like, two full days ago! Let's get with the times already! :P Note that the libvirt-check job currently fails on Debian 10, but I have already posted a libvirt patch[1] addressing that issue. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg00318.html Andrea Bolognani (5): guests: Update mappings for perl-Digest guests: Update mappings for sheepdog guests: Add Debian 10 guests: Build on Debian 10 jenkins: Build on Debian 10 guests/host_vars/libvirt-debian-10/docker.yml | 2 + .../host_vars/libvirt-debian-10/install.yml | 2 + guests/host_vars/libvirt-debian-10/main.yml | 24 ++++++ guests/inventory | 1 + guests/playbooks/build/jobs/defaults.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 3 + .../build/projects/libvirt-go-xml.yml | 1 + .../playbooks/build/projects/libvirt-go.yml | 1 + .../build/projects/libvirt-ocaml.yml | 1 + .../build/projects/libvirt-sandbox.yml | 1 + .../playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + .../build/projects/osinfo-db-tools.yml | 1 + guests/playbooks/build/projects/osinfo-db.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 2 + guests/vars/mappings.yml | 7 +- guests/vars/vault.yml | 78 ++++++++++--------- jenkins/jobs/defaults.yaml | 1 + jenkins/projects/libvirt-dbus.yaml | 3 + jenkins/projects/libvirt-go-xml.yaml | 1 + jenkins/projects/libvirt-go.yaml | 1 + jenkins/projects/libvirt-ocaml.yaml | 1 + jenkins/projects/libvirt-sandbox.yaml | 1 + jenkins/projects/libvirt-tck.yaml | 1 + jenkins/projects/libvirt.yaml | 1 + jenkins/projects/osinfo-db-tools.yaml | 1 + jenkins/projects/osinfo-db.yaml | 1 + jenkins/projects/virt-manager.yaml | 2 + 28 files changed, 102 insertions(+), 40 deletions(-) create mode 100644 guests/host_vars/libvirt-debian-10/docker.yml create mode 100644 guests/host_vars/libvirt-debian-10/install.yml create mode 100644 guests/host_vars/libvirt-debian-10/main.yml -- 2.21.0

2 12