mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-29 00:55:22 +00:00
58320848d2
This patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=871201
If libvirt is restarted after updating the dnsmasq or radvd packages,
a subsequent "virsh net-destroy" will fail to kill the dnsmasq/radvd
process.
The problem is that when libvirtd restarts, it re-reads the dnsmasq
and radvd pidfiles, then does a sanity check on each pid it finds,
including checking that the symbolic link in /proc/$pid/exe actually
points to the same file as the path used by libvirt to execute the
binary in the first place. If this fails, libvirt assumes that the
process is no longer alive.
But if the original binary has been replaced, the link in /proc is set
to "$binarypath (deleted)" (it literally has the string " (deleted)"
appended to the link text stored in the filesystem), so even if a new
binary exists in the same location, attempts to resolve the link will
fail.
In the end, not only is the old dnsmasq/radvd not terminated when the
network is stopped, but a new dnsmasq can't be started when the
network is later restarted (because the original process is still
listening on the ports that the new process wants).
The solution is, when the initial "use stat to check for identical
inodes" check for identity between /proc/$pid/exe and $binpath fails,
to check /proc/$pid/exe for a link ending with " (deleted)" and if so,
truncate that part of the link and compare what's left with the
original binarypath.
A twist to this problem is that on systems with "merged" /sbin and
/usr/sbin (i.e. /sbin is really just a symlink to /usr/sbin; Fedora
17+ is an example of this), libvirt may have started the process using
one path, but /proc/$pid/exe lists a different path (indeed, on F17
this is the case - libvirtd uses /sbin/dnsmasq, but /proc/$pid/exe
shows "/usr/sbin/dnsmasq"). The further bit of code to resolve this is
to call virFileResolveAllLinks() on both the original binarypath and
on the truncated link we read from /proc/$pid/exe, and compare the
results.
The resulting code still succeeds in all the same cases it did before,
but also succeeds if the binary was deleted or replaced after it was
started.
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| conf | ||
| cpu | ||
| esx | ||
| hyperv | ||
| interface | ||
| libxl | ||
| locking | ||
| lxc | ||
| network | ||
| node_device | ||
| nwfilter | ||
| openvz | ||
| parallels | ||
| phyp | ||
| qemu | ||
| remote | ||
| rpc | ||
| secret | ||
| security | ||
| storage | ||
| test | ||
| uml | ||
| util | ||
| vbox | ||
| vmware | ||
| vmx | ||
| xen | ||
| xenapi | ||
| xenxs | ||
| check-symfile.pl | ||
| datatypes.c | ||
| datatypes.h | ||
| driver.c | ||
| driver.h | ||
| dtrace2systemtap.pl | ||
| fdstream.c | ||
| fdstream.h | ||
| gnutls_1_0_compat.h | ||
| internal.h | ||
| libvirt_atomic.syms | ||
| libvirt_daemon.syms | ||
| libvirt_driver_modules.syms | ||
| libvirt_esx.syms | ||
| libvirt_internal.h | ||
| libvirt_libssh2.syms | ||
| libvirt_linux.syms | ||
| libvirt_openvz.syms | ||
| libvirt_private.syms | ||
| libvirt_probes.d | ||
| libvirt_public.syms | ||
| libvirt_qemu_probes.d | ||
| libvirt_qemu.syms | ||
| libvirt_sasl.syms | ||
| libvirt_vmx.syms | ||
| libvirt_xenxs.syms | ||
| libvirt-qemu.c | ||
| libvirt.c | ||
| libvirt.conf | ||
| Makefile.am | ||
| nodeinfo.c | ||
| nodeinfo.h | ||
| qemu_protocol-structs | ||
| README | ||
| remote_protocol-structs | ||
| virkeepaliveprotocol-structs | ||
| virnetprotocol-structs | ||
libvirt library code README
===========================
The directory provides the bulk of the libvirt codebase. Everything
except for the libvirtd daemon and client tools. The build uses a
large number of libtool convenience libraries - one for each child
directory, and then links them together for the final libvirt.so,
although some bits get linked directly to libvirtd daemon instead.
The files directly in this directory are supporting the public API
entry points & data structures.
There are two core shared modules to be aware of:
* util/ - a collection of shared APIs that can be used by any
code. This directory is always in the include path
for all things built
* conf/ - APIs for parsing / manipulating all the official XML
files used by the public API. This directory is only
in the include path for driver implementation modules
* vmx/ - VMware VMX config handling (used by esx/ and vmware/)
Then there are the hypervisor implementations:
* esx/ - VMware ESX and GSX support using vSphere API over SOAP
* hyperv/ - Microsoft Hyper-V support using WinRM
* lxc/ - Linux Native Containers
* openvz/ - OpenVZ containers using cli tools
* phyp/ - IBM Power Hypervisor using CLI tools over SSH
* qemu/ - QEMU / KVM using qemu CLI/monitor
* remote/ - Generic libvirt native RPC client
* test/ - A "mock" driver for testing
* uml/ - User Mode Linux
* vbox/ - Virtual Box using native API
* vmware/ - VMware Workstation and Player using the vmrun tool
* xen/ - Xen using hypercalls, XenD SEXPR & XenStore
* xenapi/ - Xen using libxenserver
Finally some secondary drivers that are shared for several HVs.
Currently these are used by LXC, OpenVZ, QEMU, UML and Xen drivers.
The ESX, Hyper-V, Power Hypervisor, Remote, Test & VirtualBox drivers all
implement the secondary drivers directly
* cpu/ - CPU feature management
* interface/ - Host network interface management
* network/ - Virtual NAT networking
* nwfilter/ - Network traffic filtering rules
* node_device/ - Host device enumeration
* secret/ - Secret management
* security/ - Mandatory access control drivers
* storage/ - Storage management drivers
Since both the hypervisor and secondary drivers can be built as
dlopen()able modules, it is *FORBIDDEN* to have build dependencies
between these directories. Drivers are only allowed to depend on
the public API, and the internal APIs in the util/ and conf/
directories