openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Kill libvirtd proc if any before start libvertd"

Browse Source
This commit is contained in:
Zuul 2019-10-21 15:43:00 +00:00 committed by Gerrit Code Review
commit 56a743e061
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,19 @@ limitations under the License.
set -ex set -ex
if [ -n "$(cat /proc/*/comm 2>/dev/null | grep libvirtd)" ]; then if [ -n "$(cat /proc/*/comm 2>/dev/null | grep -w libvirtd)" ]; then
echo "ERROR: libvirtd daemon already running on host" 1>&2 set +x
exit 1 for proc in $(ls /proc/*/comm 2>/dev/null); do
if [ "x$(cat $proc 2>/dev/null | grep -w libvirtd)" == "xlibvirtd" ]; then
set -x
libvirtpid=$(echo $proc | cut -f 3 -d '/')
echo "WARNING: libvirtd daemon already running on host" 1>&2
echo "$(cat "/proc/${libvirtpid}/status" 2>/dev/null | grep State)" 1>&2
kill -9 "$libvirtpid" || true
set +x
fi
done
set -x
fi fi
rm -f /var/run/libvirtd.pid rm -f /var/run/libvirtd.pid