diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-25 20:55:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-25 20:55:54 +0000 |
| commit | 169d0ca4df833766c878ef3ca62868ce38610db1 (patch) | |
| tree | c9b44576ce31c3d943791726150004acc561871d | |
| parent | ad6b11c17c8afd6522d9e9dce269e3f51b5b0851 (diff) | |
| parent | 1825abc8da4db5e5a85e30386c7598a61c59aa9d (diff) | |
| download | nova-169d0ca4df833766c878ef3ca62868ce38610db1.tar.gz nova-169d0ca4df833766c878ef3ca62868ce38610db1.tar.xz nova-169d0ca4df833766c878ef3ca62868ce38610db1.zip | |
Merge "Set libvirt_nonblocking to true by default for Folsom."
| -rw-r--r-- | etc/nova/nova.conf.sample | 2 | ||||
| -rw-r--r-- | nova/tests/fakelibvirt.py | 6 | ||||
| -rw-r--r-- | 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 5db4204d5..ea0e60573 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 |