Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Vinzenz Feenstra has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has uploaded a new change for review.
Change subject: vdsm: prepareVolumePath payload misdetection fix
..
vdsm: prepareVolumePath payload misdetection fix
The changeset http://gerrit.ovirt.org/#/c/22324/3
used a condition too broad for its check, causing
a device path misdetection when cloud-init is used.
It is triggered in the following case:
specParams vmPayload attribute has
file(with content), path non existent.
Device's (drive's) path is set to ''.
The code then consider the cdrom with vmPayload
a case of empty CDROM and creating it as such.
It did work before because the condition results
false when there is no 'path' in drive['specParams']
(which is the case here) and goes to the
next condition section (the right one with payload handling)
This patch provides a band-aid fix to the issue
by tightening the prepareVolumePath check.
Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363
Bug-Url: https://bugzilla.redhat.com/1047356
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/clientIF.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/22935/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index e8fb8d1..b101896 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -308,7 +308,8 @@
# next line can be removed in future, when 3.3 engine
# is not supported
drive['specParams'].get('path', '') == '' and
- drive.get('path', '') == ''):
+ drive.get('path', '') == '' and
+ 'vmPayload' not in drive['specParams']):
volPath = ''
# ... or load the drive from vmPayload:
--
To view, visit http://gerrit.ovirt.org/22935
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Francesco Romani from...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has abandoned this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Abandoned -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 2: updated the commit message -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 2: Verified+1 Verified the following, all on an is28 snapshot running on RHEL65 using Run Once * new VM from scratch, linux, just disk (no cdrom), cloud init enabled: started * new VM from scratch, linux, just disk (no cdrom), NO cloud init: started * new VM from scratch, linux, disk, cdrom (boot from cdrom), cloud init enabled: started * existing VM, linux, already installed on disk, no cdrom, cloud init enabled: started * existing VM, linux, already installed on disk, no cdrom, NO cloud initL started * existing VM, linux, already installed on disk, cdrom (boot from disk), cloud init enabled: started -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Vinzenz Feenstra has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Dan Kenigsberg has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 2: Code-Review-1 (1 comment) Commit Message Line 25: by tightening the prepareVolumePath check. Line 26: Line 27: Bug-Url: https://bugzilla.redhat.com/1047356 Line 28: Line 29: Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 please use the same Change-Id as in the post to the master branch. It makes it much easier to correlate the two changes. Also, it's better to wait until the master-branch sibling is merged, and only then post the backport. -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has restored this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Restored -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Vinzenz Feenstra has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has abandoned this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Abandoned -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: Verified+1 Verified with same tests as for master -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Dan Kenigsberg has submitted this change and it was merged. Change subject: vdsm: prepareVolumePath payload misdetection fix .. vdsm: prepareVolumePath payload misdetection fix The changeset http://gerrit.ovirt.org/#/c/22324/3 used a condition too broad for its check, causing a device path misdetection when cloud-init is used. It is triggered in the following case: specParams vmPayload attribute has file(with content), path non existent. Device's (drive's) path is set to ''. The code then consider the cdrom with vmPayload a case of empty CDROM and creating it as such. It did work before because the condition results false when there is no 'path' in drive['specParams'] (which is the case here) and goes to the next condition section (the right one with payload handling) This patch provides a band-aid fix to the issue by tightening the prepareVolumePath check. Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Bug-Url: https://bugzilla.redhat.com/1047356 Signed-off-by: Francesco Romani from...@redhat.com Reviewed-on: http://gerrit.ovirt.org/22935 Reviewed-by: Vinzenz Feenstra vfeen...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M vdsm/clientIF.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 Francesco Romani: Verified -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Dan Kenigsberg has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: Code-Review+2 As needed here as in master. -- To view, visit http://gerrit.ovirt.org/22935 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie847eb92f28d24f4d8189e03a47cd64cc6597363 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has uploaded a new change for review.
Change subject: vdsm: prepareVolumePath payload misdetection fix
..
vdsm: prepareVolumePath payload misdetection fix
The changeset http://gerrit.ovirt.org/#/c/22324/3
used a condition too broad for its check, causing
a device path misdetection when cloud-init is used.
This in turn makes vdsm to produce an invalid xml
with duplicate cdrom IDs, culminating in a qemu
failure at start.
See the buzilla linked below for a full description
of a misbehaviour.
This patch provides a band-aid fix to the issue
by tightening the prepareVolumePath check.
Bug-Url: https://bugzilla.redhat.com/1047356
Change-Id: I46292f902badca75253b7f766fc596cd92a7be88
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/clientIF.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/22923/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index e8fb8d1..b101896 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -308,7 +308,8 @@
# next line can be removed in future, when 3.3 engine
# is not supported
drive['specParams'].get('path', '') == '' and
- drive.get('path', '') == ''):
+ drive.get('path', '') == '' and
+ 'vmPayload' not in drive['specParams']):
volPath = ''
# ... or load the drive from vmPayload:
--
To view, visit http://gerrit.ovirt.org/22923
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Francesco Romani from...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: Fixes in my test box with is28 (from tag) running on RHEL 6.5 needs more verification -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: vdsm: prepareVolumePath payload misdetection fix
Francesco Romani has posted comments on this change. Change subject: vdsm: prepareVolumePath payload misdetection fix .. Patch Set 1: identical patch against master: http://gerrit.ovirt.org/#/c/22925/ -- To view, visit http://gerrit.ovirt.org/22923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46292f902badca75253b7f766fc596cd92a7be88 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
