Amador Pahim has uploaded a new change for review.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
vdsm-hooks: fix malformed libvirt xml
Missing snapshot="no" attribute is leding Storage Live Migration to fail. This patch adds snapshot="no" attribute to vdsm-hooks adding disks/directlun.
Change-Id: Id6422c45450ffc65e4fe84ab7d66a30a285dd42a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1036111 Signed-off-by: Amador Pahim apahim@redhat.com --- M vdsm_hooks/directlun/before_vm_start.py M vdsm_hooks/scratchpad/before_vm_start.py M vdsm_hooks/vmdisk/before_vm_start.py 3 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/21913/1
diff --git a/vdsm_hooks/directlun/before_vm_start.py b/vdsm_hooks/directlun/before_vm_start.py index bde62a2..4de5875 100755 --- a/vdsm_hooks/directlun/before_vm_start.py +++ b/vdsm_hooks/directlun/before_vm_start.py @@ -25,7 +25,7 @@
def createDiskElement(domxml, devpath, lunid, options): ''' - <disk device="disk" type="block"> + <disk device="disk" type="block" snapshot="no"> <source dev="/dev/mapper/lunid"/> <target bus="virtio" dev="vda"/> <driver cache="none" error_policy="stop" name="qemu" type="raw"/> @@ -35,6 +35,7 @@ disk = domxml.createElement('disk') disk.setAttribute('device', 'disk') disk.setAttribute('type', 'block') + disk.setAttribute('snapshot', 'no')
source = domxml.createElement('source') source.setAttribute('dev', devpath) diff --git a/vdsm_hooks/scratchpad/before_vm_start.py b/vdsm_hooks/scratchpad/before_vm_start.py index 2f2fe3f..2e5ddc6 100755 --- a/vdsm_hooks/scratchpad/before_vm_start.py +++ b/vdsm_hooks/scratchpad/before_vm_start.py @@ -53,7 +53,7 @@ def add_disk(domxml, path): ''' Create libvirt xml node - <disk device="disk" type="file"> + <disk device="disk" type="file" snapshot="no"> <source file="[path to image]"/> <driver cache="writeback" error_policy="stop" type="raw"/> </disk> @@ -62,6 +62,7 @@ disk = domxml.createElement('disk') disk.setAttribute('device', 'disk') disk.setAttribute('type', 'file') + disk.setAttribute('snapshot', 'no')
source = domxml.createElement('source') source.setAttribute('file', path) diff --git a/vdsm_hooks/vmdisk/before_vm_start.py b/vdsm_hooks/vmdisk/before_vm_start.py index 0d3ee0a..c08c645 100755 --- a/vdsm_hooks/vmdisk/before_vm_start.py +++ b/vdsm_hooks/vmdisk/before_vm_start.py @@ -27,7 +27,7 @@
def createDiskElement(domxml, devpath, drivertype): ''' - <disk device="disk" type="file"> + <disk device="disk" type="file" snapshot="no"> <source file="/net/myhost/myimage.img"/> <target bus="virtio" dev="vda"/> <driver cache="none" error_policy="stop" name="qemu" type="qcow2"/> @@ -37,6 +37,7 @@ disk = domxml.createElement('disk') disk.setAttribute('device', 'disk') disk.setAttribute('type', 'file') + disk.setAttribute('snapshot', 'no')
source = domxml.createElement('source') source.setAttribute('file', devpath)
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5857/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5949/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5061/ : SUCCESS
Shahar Havivi has posted comments on this change.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
Patch Set 1: Code-Review+1
Antoni Segura Puimedon has posted comments on this change.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
Patch Set 1: Code-Review+1
Sergey Gotliv has posted comments on this change.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
Patch Set 1: Code-Review+1
(3 comments)
.................................................... Commit Message Line 4: Commit: Amador Pahim apahim@redhat.com Line 5: CommitDate: 2013-12-02 09:58:01 -0300 Line 6: Line 7: vdsm-hooks: fix malformed libvirt xml Line 8: This is not a malformed xml.
This patch is preventing creation of a snapshot of direct lun, right? Line 9: Missing snapshot="no" attribute is leding Storage Live Migration Line 10: to fail. Line 11: This patch adds snapshot="no" attribute to vdsm-hooks adding Line 12: disks/directlun.
Line 6: Line 7: vdsm-hooks: fix malformed libvirt xml Line 8: Line 9: Missing snapshot="no" attribute is leding Storage Live Migration Line 10: to fail. s/leding/leading Line 11: This patch adds snapshot="no" attribute to vdsm-hooks adding Line 12: disks/directlun. Line 13: Line 14: Change-Id: Id6422c45450ffc65e4fe84ab7d66a30a285dd42a
Line 8: Line 9: Missing snapshot="no" attribute is leding Storage Live Migration Line 10: to fail. Line 11: This patch adds snapshot="no" attribute to vdsm-hooks adding Line 12: disks/directlun. Adding disks. Line 13: Line 14: Change-Id: Id6422c45450ffc65e4fe84ab7d66a30a285dd42a Line 15: Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1036111
Sergey Gotliv has posted comments on this change.
Change subject: vdsm-hooks: fix malformed libvirt xml ......................................................................
Patch Set 1:
Adding maintainers.
Sergey Gotliv has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2: Code-Review+1
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5861/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5953/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5065/ : SUCCESS
Amador Pahim has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2: Verified+1
Dan Kenigsberg has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2: Code-Review+1
I'd love to see Federico's ack on this, as my understanding of SLM is limited.
Federico Simoncelli has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2: Code-Review+1
(1 comment)
Code is ok but I'd prefer to see the commit message fixed. Dan feel free to take it in if you don't care about the message.
.................................................... Commit Message Line 5: CommitDate: 2013-12-02 12:19:10 -0300 Line 6: Line 7: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. Line 8: Line 9: Missing snapshot="no" attribute is leading Storage Live Migration to fail. This is not related to LSM, it's about live snapshots. The fact that in preparation to LSM we do a live snapshot is just a detail. Line 10: This patch adds snapshot="no" attribute to vdsm hooks adding disks. Line 11: Line 12: Change-Id: Id6422c45450ffc65e4fe84ab7d66a30a285dd42a Line 13: Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1036111
Federico Simoncelli has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. ......................................................................
Patch Set 2:
(1 comment)
Code is ok but I'd prefer to see the commit message fixed. Dan feel free to take it in if you don't care about the message.
.................................................... Commit Message Line 3: AuthorDate: 2013-12-02 09:58:01 -0300 Line 4: Commit: Amador Pahim apahim@redhat.com Line 5: CommitDate: 2013-12-02 12:19:10 -0300 Line 6: Line 7: vdsm hooks: Add missing "snapshot=no" attribute to "disk" ellements. If you're about to change the commit message, s/ellements/elements/ Line 8: Line 9: Missing snapshot="no" attribute is leading Storage Live Migration to fail. Line 10: This patch adds snapshot="no" attribute to vdsm hooks adding disks. Line 11:
Amador Pahim has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" elements. ......................................................................
Patch Set 3: Verified+1
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" elements. ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5945/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5149/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6037/ : SUCCESS
Dan Kenigsberg has posted comments on this change.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" elements. ......................................................................
Patch Set 3: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: vdsm hooks: Add missing "snapshot=no" attribute to "disk" elements. ......................................................................
vdsm hooks: Add missing "snapshot=no" attribute to "disk" elements.
Missing snapshot="no" attribute is leading live snapshot to fail. This patch adds snapshot="no" attribute to vdsm hooks adding disks.
Change-Id: Id6422c45450ffc65e4fe84ab7d66a30a285dd42a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1036111 Signed-off-by: Amador Pahim apahim@redhat.com Reviewed-on: http://gerrit.ovirt.org/21913 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M vdsm_hooks/directlun/before_vm_start.py M vdsm_hooks/scratchpad/before_vm_start.py M vdsm_hooks/vmdisk/before_vm_start.py 3 files changed, 6 insertions(+), 3 deletions(-)
Approvals: Amador Pahim: Verified Dan Kenigsberg: Looks good to me, approved
vdsm-patches@lists.fedorahosted.org
-
apahim＠redhat.com -
asegurap＠redhat.com -
Dan Kenigsberg -
Federico Simoncelli -
Jenkins CI RO -
sgotliv＠redhat.com -
shavivi＠redhat.com