From 1dfcd8e6cdd58a0737a8667f8d2b18190527657a Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 14 Dec 2010 17:02:43 +0000 Subject: nothing --- nova/virt/xenapi/vm_utils.py | 1 + plugins/xenapi/etc/xapi.d/plugins/objectstore | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index eeceb8e71..2c20e33ac 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -195,6 +195,7 @@ class VMHelper(): args['vdi-ref']=vdi_ref #TODO: Call proper function in plugin task = yield session.async_call_plugin('objectstore', fn, args) + logging.debug("Waiting for task completion") pv=yield session.wait_for_task(task) logging.debug("PV Kernel in VDI:%d",pv) defer.returnValue(pv) diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore index bc9e783cf..e748742b1 100644 --- a/plugins/xenapi/etc/xapi.d/plugins/objectstore +++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore @@ -49,20 +49,26 @@ def is_vdi_pv(session,args): pv=False pv=with_vdi_in_dom0(session, vdi, False, lambda dev: _is_vdi_pv('/dev/%s' % dev)) + logging.debug("HERE - bye bye") return pv def _is_vdi_pv(dest): logging.debug("Running pygrub against %s",dest) output=os.popen('pygrub -qn %s' % dest) + logging.debug("HERE - 1") pv=False + logging.debug("HERE - 2") for line in output.readlines(): - logging.debug("line:",line) + #logging.debug("line:",line) + logging.debug("HERE - loop") #try to find kernel string m=re.search('(?<=kernel:)/.*(?:>)',line) if (m<>None): if m.group(0).find('xen')<>-1: pv=True + logging.debug("HERE - 3") logging.debug("PV:%d",pv) + logging.debug("HERE - 4") return pv def get_vdi(session, args): -- cgit