openstack/openstack-helm
Code Issues Proposed changes

Check libvirtd based on /proc instead of /var/run

Browse Source 
Change libvirtd check to look for pre-existing libvirt processes on the host based on /proc, which is more reliable than pidfiles written under /var/run/ which may be stale or may not be written at all.

Change-Id: I8a08dc7930c15ae90e1c6fb8a5fa3344cca2380f
Closes-Bug: #1715702
This commit is contained in:
Craig Anderson 2017-09-14 10:56:51 -07:00
parent af77125f10
commit 388562e672
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvirt/templates/bin/_libvirt.sh.tpl
View File

@ -18,11 +18,9 @@ limitations under the License.
set -ex set -ex
if [[ -f /var/run/libvirtd.pid ]]; then if [ -n "$(cat /proc/*/comm 2>/dev/null | grep libvirtd)" ]; then
LIBVIRTD_PID="$(< /var/run/libvirtd.pid)" echo "ERROR: libvirtd daemon already running on host" 1>&2
test -d "/proc/$LIBVIRTD_PID" && \ exit 1
test 'libvirtd' = "$(< /proc/$LIBVIRTD_PID/comm)" && \
( echo "ERROR: Libvirtd daemon is already running" && exit 1 )
fi fi
rm -f /var/run/libvirtd.pid rm -f /var/run/libvirtd.pid