summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-28 18:09:19 +0000
committerGerrit Code Review <review@openstack.org>2013-02-28 18:09:19 +0000
commit2c78edfcc9d6d5bfef3830a7db886b535314e336 (patch)
treebb67cb0b139d519b8afeb19b4fb46d185b59fa40
parent79cf4dc61fa85e36eb1913b3f9455d175bae7b38 (diff)
parentea07be64a455caa19e5088639cad70ee0e4e91fb (diff)
downloadnova-2c78edfcc9d6d5bfef3830a7db886b535314e336.tar.gz
nova-2c78edfcc9d6d5bfef3830a7db886b535314e336.tar.xz
nova-2c78edfcc9d6d5bfef3830a7db886b535314e336.zip
Merge "Run libguestfs API calls in a thread pool"
-rw-r--r--nova/virt/disk/vfs/guestfs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/disk/vfs/guestfs.py b/nova/virt/disk/vfs/guestfs.py
index 11cf9d098..985858a0d 100644
--- a/nova/virt/disk/vfs/guestfs.py
+++ b/nova/virt/disk/vfs/guestfs.py
@@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+from eventlet import tpool
import guestfs
from nova import exception
@@ -93,7 +94,7 @@ class VFSGuestFS(vfs.VFS):
def setup(self):
LOG.debug(_("Setting up appliance for %(imgfile)s %(imgfmt)s") %
{'imgfile': self.imgfile, 'imgfmt': self.imgfmt})
- self.handle = guestfs.GuestFS()
+ self.handle = tpool.Proxy(guestfs.GuestFS())
try:
self.handle.add_drive_opts(self.imgfile, format=self.imgfmt)