openstack/devstack
Code Issues Proposed changes

put libvirt debug behind a flag

Browse Source 
only turn on the libvirt debugging if we really need it, which
we could control in the gate via devstack-gate.

Change-Id: I5e6d41d5333357608ab6a614610c060400f70a10
This commit is contained in:
Sean Dague 2014-03-11 16:38:57 -04:00
parent efad7911a4
commit dd304603e0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nova_plugins/hypervisor-libvirt
View File

@ -25,6 +25,8 @@ set +o xtrace
# File injection is disabled by default in Nova. This will turn it back on. # File injection is disabled by default in Nova. This will turn it back on.
ENABLE_FILE_INJECTION=${ENABLE_FILE_INJECTION:-False} ENABLE_FILE_INJECTION=${ENABLE_FILE_INJECTION:-False}
# if we should turn on massive libvirt debugging
DEBUG_LIBVIRT=$(trueorfalse False $DEBUG_LIBVIRT)
# Entry Points # Entry Points
@ -104,13 +106,15 @@ EOF
add_user_to_group $STACK_USER $LIBVIRT_GROUP add_user_to_group $STACK_USER $LIBVIRT_GROUP
# Enable server side traces for libvirtd # Enable server side traces for libvirtd
local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util" if [[ "$DEBUG_LIBVIRT" = "True" ]] ; then
local log_outputs="1:file:/var/log/libvirt/libvirtd.log" local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"
if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
fi echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then fi
echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
fi
fi fi
# libvirt detects various settings on startup, as we potentially changed # libvirt detects various settings on startup, as we potentially changed