Change in vdsm[master]: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................

vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks

_getUnderlyingDriveInfo() is broken by design. It has no reliable means
to match Engine-requested devices with libvirt-produced ones. As a
heuristic, it uses the device's as matching key. However, before this
patch, it failed to extract the path from the xml definition of gluster
disks.

Bug-Url: https://bugzilla.redhat.com/1007980
Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/19906/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index f09b739..c85dc10 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -4647,7 +4647,8 @@
             sources = x.getElementsByTagName('source')
             if sources:
                 devPath = (sources[0].getAttribute('file') or
-                           sources[0].getAttribute('dev'))
+                           sources[0].getAttribute('dev') or
+                           sources[0].getAttribute('name'))
             else:
                 devPath = ''
 


-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks

_getUnderlyingDriveInfo() is broken by design. It has no reliable means
to match Engine-requested devices with libvirt-produced ones. As a
heuristic, it uses the device's as matching key. However, before this
patch, it failed to extract the path from the xml definition of gluster
disks.

Bug-Url: https://bugzilla.redhat.com/1007980
Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/19906
Reviewed-by: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Reviewed-by: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Reviewed-by: Martin Polednik <mpoledni(a)redhat.com&gt;
Tested-by: Martin Polednik <mpoledni(a)redhat.com&gt;
---
M vdsm/vm.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Vinzenz Feenstra: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved
  Michal Skrivanek: Looks good to me, but someone else must approve
  Martin Polednik: Verified; Looks good to me, but someone else must approve



-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1: Code-Review+2

(1 comment)

....................................................
File vdsm/vm.py
Line 4647:             sources = x.getElementsByTagName('source')
Line 4648:             if sources:
Line 4649:                 devPath = (sources[0].getAttribute('file') or
Line 4650:                            sources[0].getAttribute('dev') or
Line 4651:                            sources[0].getAttribute('name'))
Given the +1s and verifications - I opt for postponing log fixes to a future patch.
Line 4652:             else:
Line 4653:                 devPath = ''
Line 4654: 
Line 4655:             target = x.getElementsByTagName('target')


-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Martin Polednik has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1: Verified+1 Code-Review+1

verified, fixes bug #1007980

-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Michal Skrivanek has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1:

(1 comment)

....................................................
File vdsm/vm.py
Line 4647:             sources = x.getElementsByTagName('source')
Line 4648:             if sources:
Line 4649:                 devPath = (sources[0].getAttribute('file') or
Line 4650:                            sources[0].getAttribute('dev') or
Line 4651:                            sources[0].getAttribute('name'))
would be good to actually add some log lines. It is once per VM life so I think it is
worth couple of lines what devices we have, what is matched, etc...
e.g. in this case it would save us 2 weeks
Line 4652:             else:
Line 4653:                 devPath = ''
Line 4654: 
Line 4655:             target = x.getElementsByTagName('target')


-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

[Vinzenz Feenstra]

Vinzenz Feenstra has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1: Code-Review+1

-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4727/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4803/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3918/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Michal Skrivanek has posted comments on this change.

Change subject: vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks
......................................................................


Patch Set 1: Code-Review+1

Martin, can you please verify...

-- 
To view, visit http://gerrit.ovirt.org/19906
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4459916cab24d735c067a6eb7020d4f43505fc97
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Martin Polednik <mpoledni(a)redhat.com&gt;
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt;
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No