From 1825abc8da4db5e5a85e30386c7598a61c59aa9d Mon Sep 17 00:00:00 2001 From: Yun Mao Date: Mon, 18 Jun 2012 13:12:31 -0400 Subject: Set libvirt_nonblocking to true by default for Folsom. Make the fake libvirt module look more like the real module. Change-Id: Ie03f24c6e5c3027d83d8f3d87d049f7f9df29e5b --- etc/nova/nova.conf.sample | 2 +- nova/tests/fakelibvirt.py | 6 ++++++ nova/virt/libvirt/connection.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index 8726f5dcb..a84d212da 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -1417,7 +1417,7 @@ #### soft reboot request is made. We fall back to hard reboot if #### instance does not shutdown within this window. -# libvirt_nonblocking=false +# libvirt_nonblocking=true #### (BoolOpt) Use a separated OS thread pool to realize non-blocking #### libvirt calls diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py index 3e4c63719..4350a8878 100644 --- a/nova/tests/fakelibvirt.py +++ b/nova/tests/fakelibvirt.py @@ -797,3 +797,9 @@ def openAuth(uri, auth, flags): "this auth method")) return Connection(uri, readonly=False) + + +virDomain = Domain + + +virConnect = Connection diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 6f0f1f630..c9f8a35b4 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -156,7 +156,7 @@ libvirt_opts = [ ' soft reboot request is made. We fall back to hard reboot' ' if instance does not shutdown within this window.'), cfg.BoolOpt('libvirt_nonblocking', - default=False, + default=True, help='Use a separated OS thread pool to realize non-blocking' ' libvirt calls'), # force_config_drive is a string option, to allow for future behaviors -- cgit