Change in vdsm[master]: vdsm: vdsm_hooks replace/remove too generic except handlers
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: vdsm: vdsm_hooks replace/remove too generic except handlers
......................................................................
vdsm: vdsm_hooks replace/remove too generic except handlers
Change-Id: I64d51a8b1150f2dd4f9e7711926e5406228c8355
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M vdsm_hooks/checkimages/before_vm_start.py
M vdsm_hooks/directlun/after_vm_destroy.py
M vdsm_hooks/directlun/before_vm_migrate_destination.py
M vdsm_hooks/directlun/before_vm_start.py
M vdsm_hooks/fileinject/before_vm_start.py
M vdsm_hooks/floppy/before_vm_start.py
M vdsm_hooks/hostusb/after_vm_destroy.py
M vdsm_hooks/hostusb/before_vm_start.py
M vdsm_hooks/hugepages/after_vm_destroy.py
M vdsm_hooks/hugepages/before_vm_migrate_destination.py
M vdsm_hooks/hugepages/before_vm_start.py
M vdsm_hooks/isolatedprivatevlan/before_vm_start.py
M vdsm_hooks/numa/before_vm_start.py
M vdsm_hooks/openstacknet/after_device_create.py
M vdsm_hooks/openstacknet/before_device_create.py
M vdsm_hooks/pincpu/before_vm_start.py
M vdsm_hooks/promisc/after_vm_start.py
M vdsm_hooks/promisc/before_vm_destroy.py
M vdsm_hooks/qemucmdline/before_vm_start.py
M vdsm_hooks/qos/before_vm_start.py
M vdsm_hooks/scratchpad/after_vm_destroy.py
M vdsm_hooks/scratchpad/before_vm_start.py
M vdsm_hooks/smbios/before_vm_start.py
M vdsm_hooks/sriov/after_vm_destroy.py
M vdsm_hooks/sriov/before_vm_start.py
M vdsm_hooks/vmdisk/before_vm_start.py
M vdsm_hooks/vmfex/before_vm_migrate_destination.py
M vdsm_hooks/vmfex/before_vm_start.py
28 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/17759/1
diff --git a/vdsm_hooks/checkimages/before_vm_start.py b/vdsm_hooks/checkimages/before_vm_start.py
index 0fb1d85..14f1ae5 100755
--- a/vdsm_hooks/checkimages/before_vm_start.py
+++ b/vdsm_hooks/checkimages/before_vm_start.py
@@ -133,7 +133,7 @@
sys.stderr.write('checkimages: Checking image %s. ' %
disk_image)
checkImage(disk_image, image_timeout)
- except:
+ except Exception:
sys.stderr.write('checkimages [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/directlun/after_vm_destroy.py b/vdsm_hooks/directlun/after_vm_destroy.py
index ce51469..d3a0056 100755
--- a/vdsm_hooks/directlun/after_vm_destroy.py
+++ b/vdsm_hooks/directlun/after_vm_destroy.py
@@ -42,7 +42,7 @@
removeDeviceNode(devpath)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('directlun after_vm_destroy: [unexpected error]: '
'%s\n' % traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/directlun/before_vm_migrate_destination.py b/vdsm_hooks/directlun/before_vm_migrate_destination.py
index b80e60d..1c94559 100755
--- a/vdsm_hooks/directlun/before_vm_migrate_destination.py
+++ b/vdsm_hooks/directlun/before_vm_migrate_destination.py
@@ -99,7 +99,7 @@
cloneDeviceNode(srcpath, devpath)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('directlun before_vm_migration_destination: '
'[unexpected error]: %s\n' % traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/directlun/before_vm_start.py b/vdsm_hooks/directlun/before_vm_start.py
index bde62a2..f7b71fa 100755
--- a/vdsm_hooks/directlun/before_vm_start.py
+++ b/vdsm_hooks/directlun/before_vm_start.py
@@ -161,7 +161,7 @@
devices.appendChild(diskdev)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('directlun: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/fileinject/before_vm_start.py b/vdsm_hooks/fileinject/before_vm_start.py
index 0f571e8..19beab4 100755
--- a/vdsm_hooks/fileinject/before_vm_start.py
+++ b/vdsm_hooks/fileinject/before_vm_start.py
@@ -114,7 +114,7 @@
'path not exists: %s\n' %
os.path.dirname(filepath))
sys.exit(2)
- except:
+ except Exception:
sys.stderr.write('fileinject: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/floppy/before_vm_start.py b/vdsm_hooks/floppy/before_vm_start.py
index 7616ac6..e2846ed 100755
--- a/vdsm_hooks/floppy/before_vm_start.py
+++ b/vdsm_hooks/floppy/before_vm_start.py
@@ -50,7 +50,7 @@
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('floppy: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/hostusb/after_vm_destroy.py b/vdsm_hooks/hostusb/after_vm_destroy.py
index 8c18a53..7ccc516 100755
--- a/vdsm_hooks/hostusb/after_vm_destroy.py
+++ b/vdsm_hooks/hostusb/after_vm_destroy.py
@@ -84,7 +84,7 @@
sys.exit(2)
chown(vendorid, productid)
- except:
+ except Exception:
sys.stderr.write('hostusb after_vm_destroy: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/hostusb/before_vm_start.py b/vdsm_hooks/hostusb/before_vm_start.py
index 266df60..16c6e23 100755
--- a/vdsm_hooks/hostusb/before_vm_start.py
+++ b/vdsm_hooks/hostusb/before_vm_start.py
@@ -132,7 +132,7 @@
chown(vendorid, productid)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('hostusb: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/hugepages/after_vm_destroy.py b/vdsm_hooks/hugepages/after_vm_destroy.py
index 2fb5e85..61584ff 100755
--- a/vdsm_hooks/hugepages/after_vm_destroy.py
+++ b/vdsm_hooks/hugepages/after_vm_destroy.py
@@ -22,7 +22,7 @@
pages = int(os.environ.get('hugepages'))
removeSysHugepages(pages)
- except:
+ except Exception:
sys.stderr.write('hugepages: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/hugepages/before_vm_migrate_destination.py b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
index d076398..69bb55d 100755
--- a/vdsm_hooks/hugepages/before_vm_migrate_destination.py
+++ b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
@@ -51,7 +51,7 @@
pages = int(os.environ.get('hugepages'))
addSysHugepages(pages)
- except:
+ except Exception:
sys.stderr.write('hugepages before_vm_migraton_destination: '
'[unexpected error]: %s\n' % traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/hugepages/before_vm_start.py b/vdsm_hooks/hugepages/before_vm_start.py
index cddf475..1b6c166 100755
--- a/vdsm_hooks/hugepages/before_vm_start.py
+++ b/vdsm_hooks/hugepages/before_vm_start.py
@@ -98,7 +98,7 @@
sys.stderr.write('hugepages: adding hugepages tag\n')
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('hugepages: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
index 6f839ed..4ab08c7 100755
--- a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
+++ b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
@@ -45,7 +45,7 @@
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('isolated-privatevlan: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/numa/before_vm_start.py b/vdsm_hooks/numa/before_vm_start.py
index cefdb6f..84c8a48 100755
--- a/vdsm_hooks/numa/before_vm_start.py
+++ b/vdsm_hooks/numa/before_vm_start.py
@@ -47,7 +47,7 @@
else:
sys.stderr.write('numa: numa already exists in domain xml')
sys.exit(2)
- except:
+ except Exception:
sys.stderr.write('numa: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py
index e90d759..df3bdce 100755
--- a/vdsm_hooks/openstacknet/after_device_create.py
+++ b/vdsm_hooks/openstacknet/after_device_create.py
@@ -63,6 +63,6 @@
if __name__ == '__main__':
try:
main()
- except:
+ except Exception:
hooking.exit_hook('openstacknet hook: [unexpected error]: %s\n' %
traceback.format_exc())
diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py
index 6a9e6d1..dc56073 100755
--- a/vdsm_hooks/openstacknet/before_device_create.py
+++ b/vdsm_hooks/openstacknet/before_device_create.py
@@ -129,6 +129,6 @@
test(useOvs)
else:
main()
- except:
+ except Exception:
hooking.exit_hook('openstacknet hook: [unexpected error]: %s\n' %
traceback.format_exc())
diff --git a/vdsm_hooks/pincpu/before_vm_start.py b/vdsm_hooks/pincpu/before_vm_start.py
index 6ea4528..2a72795 100755
--- a/vdsm_hooks/pincpu/before_vm_start.py
+++ b/vdsm_hooks/pincpu/before_vm_start.py
@@ -28,7 +28,7 @@
else:
sys.stderr.write('pincpu: cpuset attribute is present in vcpu, '
'doing nothing\n')
- except:
+ except Exception:
sys.stderr.write('pincpu: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/promisc/after_vm_start.py b/vdsm_hooks/promisc/after_vm_start.py
index 30f04eb..fbf4097 100755
--- a/vdsm_hooks/promisc/after_vm_start.py
+++ b/vdsm_hooks/promisc/after_vm_start.py
@@ -126,7 +126,7 @@
#the vm interface
captureNetwork(ifaceName, network, mode)
- except:
+ except Exception:
sys.stderr.write('promisc: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/promisc/before_vm_destroy.py b/vdsm_hooks/promisc/before_vm_destroy.py
index d041c19..c9075ba 100755
--- a/vdsm_hooks/promisc/before_vm_destroy.py
+++ b/vdsm_hooks/promisc/before_vm_destroy.py
@@ -44,7 +44,7 @@
'mode %s\n' % (network, mode))
removeMirrorNetwork(network)
- except:
+ except Exception:
sys.stderr.write('promisc: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/qemucmdline/before_vm_start.py b/vdsm_hooks/qemucmdline/before_vm_start.py
index b3b9214..74fb829 100755
--- a/vdsm_hooks/qemucmdline/before_vm_start.py
+++ b/vdsm_hooks/qemucmdline/before_vm_start.py
@@ -74,7 +74,7 @@
injectQemuCmdLine(domxml, qemu_cmdline)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('qemu_cmdline: [unexpected error]: %s\n'
% traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/qos/before_vm_start.py b/vdsm_hooks/qos/before_vm_start.py
index 7cdf46f..0eac730 100755
--- a/vdsm_hooks/qos/before_vm_start.py
+++ b/vdsm_hooks/qos/before_vm_start.py
@@ -87,7 +87,7 @@
update_interface(iface, arr[1], domxml)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('qos hook: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/scratchpad/after_vm_destroy.py b/vdsm_hooks/scratchpad/after_vm_destroy.py
index 474bff5..fb392d9 100755
--- a/vdsm_hooks/scratchpad/after_vm_destroy.py
+++ b/vdsm_hooks/scratchpad/after_vm_destroy.py
@@ -15,7 +15,7 @@
else:
sys.stderr.write('scratchpad after_vm_destroy: '
'cannot find image file %s\n' % arr[1])
- except:
+ except Exception:
sys.stderr.write('scratchpad after_vm_destroy: '
'[unexpected error]: %s\n' % traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/scratchpad/before_vm_start.py b/vdsm_hooks/scratchpad/before_vm_start.py
index 2f2fe3f..47dc0e0 100755
--- a/vdsm_hooks/scratchpad/before_vm_start.py
+++ b/vdsm_hooks/scratchpad/before_vm_start.py
@@ -129,7 +129,7 @@
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('scratchpad: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py
index 55635a9..26d68c0 100755
--- a/vdsm_hooks/smbios/before_vm_start.py
+++ b/vdsm_hooks/smbios/before_vm_start.py
@@ -102,7 +102,7 @@
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('smbios: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/sriov/after_vm_destroy.py b/vdsm_hooks/sriov/after_vm_destroy.py
index e82dab0..6cf5120 100755
--- a/vdsm_hooks/sriov/after_vm_destroy.py
+++ b/vdsm_hooks/sriov/after_vm_destroy.py
@@ -35,7 +35,7 @@
'virtual function reservation file of %s'
'that should be at %s\n' % (nic, vfFilePath))
- except:
+ except Exception:
sys.stderr.write('sriov after_vm_destroy: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/sriov/before_vm_start.py b/vdsm_hooks/sriov/before_vm_start.py
index c23797b..41d7df3 100755
--- a/vdsm_hooks/sriov/before_vm_start.py
+++ b/vdsm_hooks/sriov/before_vm_start.py
@@ -154,7 +154,7 @@
sys.exit(2)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('sriov: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/vmdisk/before_vm_start.py b/vdsm_hooks/vmdisk/before_vm_start.py
index 0d3ee0a..8ff0f3d 100755
--- a/vdsm_hooks/vmdisk/before_vm_start.py
+++ b/vdsm_hooks/vmdisk/before_vm_start.py
@@ -90,7 +90,7 @@
devices.appendChild(diskdev)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('vmdisk: [unexpected error]: %s\n' %
traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/vmfex/before_vm_migrate_destination.py b/vdsm_hooks/vmfex/before_vm_migrate_destination.py
index 9ea7c28..0315bb7 100755
--- a/vdsm_hooks/vmfex/before_vm_migrate_destination.py
+++ b/vdsm_hooks/vmfex/before_vm_migrate_destination.py
@@ -133,6 +133,6 @@
conn = libvirtconnection.get()
handleDirectPool(conn)
- except:
+ except Exception:
sys.stderr.write('vmfex: ERROR: %s\n' % traceback.format_exc())
sys.exit(2)
diff --git a/vdsm_hooks/vmfex/before_vm_start.py b/vdsm_hooks/vmfex/before_vm_start.py
index 0e98419..b050626 100755
--- a/vdsm_hooks/vmfex/before_vm_start.py
+++ b/vdsm_hooks/vmfex/before_vm_start.py
@@ -193,6 +193,6 @@
parameters.setAttribute('profileid', profile)
virtualport.appendChild(parameters)
hooking.write_domxml(domxml)
- except:
+ except Exception:
sys.stderr.write('vmfex: ERROR %s\n' % traceback.format_exc())
sys.exit(2)
--
To view, visit http://gerrit.ovirt.org/17759
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64d51a8b1150f2dd4f9e7711926e5406228c8355
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: nit: sudoers: drop unused executable
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: nit: sudoers: drop unused executable
......................................................................
nit: sudoers: drop unused executable
Should have been dropped by "Move prepare-vmchannel to supervdsm"
http://gerrit.ovirt.org/4242
Change-Id: Ib43ff714b243816e9746700efd0fbe8bd9a494e2
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/sudoers.vdsm.in
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/25250/1
diff --git a/vdsm/sudoers.vdsm.in b/vdsm/sudoers.vdsm.in
index ff9e703..584807d 100644
--- a/vdsm/sudoers.vdsm.in
+++ b/vdsm/sudoers.vdsm.in
@@ -2,8 +2,7 @@
@DMIDECODE_PATH@, \
@VDSMDIR@/mk_sysprep_floppy, \
@SERVICE_PATH@ ksmtuned *, \
- @SERVICE_PATH@ ksm *, \
- @VDSMDIR@/prepare-vmchannel
+ @SERVICE_PATH@ ksm *
Cmnd_Alias VDSM_STORAGE = @MOUNT_PATH@, @UMOUNT_PATH@, \
@FSCK_PATH@ -p *, \
@TUNE2FS_PATH@ -j *, \
--
To view, visit http://gerrit.ovirt.org/25250
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib43ff714b243816e9746700efd0fbe8bd9a494e2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: vm: Set numatune and guest numa topology
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: vm: Set numatune and guest numa topology
......................................................................
vm: Set numatune and guest numa topology
Modify vm module to provide the functions of set numatune and guest
numa topology when create vm.
Modify vdsClient to add the related options.
The xml format of numatune is like:
<domain>
...
<numatune>
<memory mode="strict" nodeset="1-4,^3"/>
</numatune>
...
</domain>
The format of guest numa topology is like:
<cpu>
...
<numa>
<cell cpus='0-3' memory='512000'/>
<cell cpus='4-7' memory='512000'/>
</numa>
...
</cpu>
More detailed libvirt reference in:
http://libvirt.org/formatdomain.html#elementsNUMATuning and
http://libvirt.org/formatdomain.html#elementsCPU
Change-Id: I88ec56047809b03449a788ead0b97f9ed876712d
Bug-Url: https://bugzilla.redhat.com/1069303
Signed-off-by: Bruce Shi <xiao-lei.shi(a)hp.com>
Reviewed-on: http://gerrit.ovirt.org/25254
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M client/vdsClient.py
M tests/vdsClientTests.py
M tests/vmTests.py
M tests/vmTestsData.py
M vdsm/vm.py
M vdsm_api/vdsmapi-schema.json
6 files changed, 127 insertions(+), 8 deletions(-)
Approvals:
Dan Kenigsberg: Looks good to me, approved
Xiaolei Shi: Verified
--
To view, visit http://gerrit.ovirt.org/25254
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88ec56047809b03449a788ead0b97f9ed876712d
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 2 months
Change in vdsm[master]: vm: Set numatune and guest numa topology
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: vm: Set numatune and guest numa topology
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.ovirt.org/25254
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I88ec56047809b03449a788ead0b97f9ed876712d
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Xiaolei Shi <xiao-lei.shi(a)hp.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
10 years, 2 months
Change in vdsm[ovirt-3.4]: libvirt_configure: persist cmd qemu-sanlock.conf
by Douglas Schilling Landgraf
Hello Fabian Deutsch, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/25992
to review the following change.
Change subject: libvirt_configure: persist cmd qemu-sanlock.conf
......................................................................
libvirt_configure: persist cmd qemu-sanlock.conf
On a ovirt-node if executing vdsm-tool configure --force
with libvirt sanlock enabled it will set /etc/libvirt/qemu-sanlock.conf
but won't use persist command so next reboot the changes will be lost
and vdsm-tool will complain about libvirt not configured during vdsm start.
Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/25968
Reviewed-by: Fabian Deutsch <fabiand(a)fedoraproject.org>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/25992/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index eacb37c..f2f7c2c 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -318,7 +318,12 @@
# persist cmd is ovirt_store_config on ovirt-functions
if isOvirtNode; then
. /usr/libexec/ovirt-functions
- ovirt_store_config "${lconf}" "${qconf}" "${ldconf}" "${llogr}"
+ ovirt_store_config \
+ "${lconf}" \
+ "${ldconf}" \
+ "${llogr}" \
+ "${qconf}" \
+ "${qlconf}"
fi
echo "Reconfiguration of libvirt is done."
--
To view, visit http://gerrit.ovirt.org/25992
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand(a)fedoraproject.org>
10 years, 2 months
Change in vdsm[ovirt-3.4]: spec: use Requires %{name}
by Douglas Schilling Landgraf
Hello Kiril Nesenko, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/25986
to review the following change.
Change subject: spec: use Requires %{name}
......................................................................
spec: use Requires %{name}
We should use macros instead of static names in the spec.
If in the future we decide to use different name for vdsm package
it's a matter to put the new package name in Name session.
Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/24301
Reviewed-by: Kiril Nesenko <knesenko(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/25986/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 581d294..4347840 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -349,7 +349,7 @@
%package debug-plugin
Summary: VDSM Debug Plugin
-Requires: vdsm
+Requires: %{name}
Requires: %{name}-xmlrpc = %{version}-%{release}
BuildArch: noarch
@@ -358,7 +358,7 @@
%package tests
Summary: VDSM Test Suite
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: dracut
Requires: python-nose
BuildArch: noarch
@@ -369,7 +369,7 @@
%package hook-checkimages
Summary: Qcow2 disk image format check hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-checkimages
VDSM hook used to perform consistency check on a qcow2 format disk image
@@ -388,7 +388,7 @@
%package hook-faqemu
Summary: Fake qemu process for VDSM quality assurance
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-faqemu
VDSM hook used for testing VDSM with multiple fake virtual machines without
@@ -416,7 +416,7 @@
%package hook-extnet
Summary: Force a vNIC to connect to a specific libvirt network
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description hook-extnet
VDSM hook which allows to connect a vNIC to a libvirt network that is managed
@@ -507,7 +507,7 @@
%package hook-qemucmdline
Summary: QEMU cmdline hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-qemucmdline
Provides support for injecting QEMU cmdline via VDSM hook.
@@ -561,7 +561,7 @@
%package hook-vmfex-dev
Summary: VM-FEX vNIC support for VDSM
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Conflicts: hook-vmfex
%description hook-vmfex-dev
--
To view, visit http://gerrit.ovirt.org/25986
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Kiril Nesenko <knesenko(a)redhat.com>
10 years, 2 months
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
by Douglas Schilling Landgraf
Hello Federico Simoncelli, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/25985
to review the following change.
Change subject: spec: add missing requirement for sanlock on el7
......................................................................
spec: add missing requirement for sanlock on el7
In the el7 section we were missing the sanlock and sanlock-python
requirements.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1064042
Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/25173
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Tested-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/25985/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 91b9590..581d294 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -152,6 +152,8 @@
Requires: iscsi-initiator-utils >= 6.2.0.873-3
%endif
+Requires: sanlock >= 2.8, sanlock-python
+
%if 0%{?rhel}
Requires: python-ethtool >= 0.6-3
%if 0%{?rhel} >= 7
@@ -175,7 +177,6 @@
Requires: e2fsprogs >= 1.41.12-11
Requires: fence-agents
Requires: kernel >= 2.6.32-279.9.1
-Requires: sanlock >= 2.8, sanlock-python
Requires: initscripts >= 9.03.31-2.el6_3.1
Requires: policycoreutils >= 2.0.83-19.30
Requires: policycoreutils-python >= 2.0.83-19.30
@@ -204,7 +205,6 @@
%endif
Requires: device-mapper-multipath >= 0.4.9-18
Requires: e2fsprogs >= 1.41.14
-Requires: sanlock >= 2.8, sanlock-python
Requires: policycoreutils-python
Requires: sed >= 4.2.1-10
Requires: ed
--
To view, visit http://gerrit.ovirt.org/25985
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
10 years, 2 months
Change in vdsm[ovirt-3.4]: openstack_net hook: search for ovs_vsctl only when needed
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: openstack_net hook: search for ovs_vsctl only when needed
......................................................................
openstack_net hook: search for ovs_vsctl only when needed
Change-Id: I397e17782f61a94f734cf060d5ecad768379abcc
Bug-Url: https://bugzilla.redhat.com/1077283
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/25889
Reviewed-by: Moti Asayag <masayag(a)redhat.com>
Tested-by: Martin Pavlik <xpavli44(a)gmail.com>
(cherry picked from commit 89362adee054696d41377a4d8ad6cf993ced91a9)
---
M vdsm_hooks/openstacknet/after_device_destroy.py
M vdsm_hooks/openstacknet/before_device_create.py
M vdsm_hooks/openstacknet/openstacknet_utils.py
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/25900/1
diff --git a/vdsm_hooks/openstacknet/after_device_destroy.py b/vdsm_hooks/openstacknet/after_device_destroy.py
index 8e13412..3cc7261 100755
--- a/vdsm_hooks/openstacknet/after_device_destroy.py
+++ b/vdsm_hooks/openstacknet/after_device_destroy.py
@@ -19,7 +19,6 @@
import hooking
from openstacknet_utils import EXT_BRCTL
from openstacknet_utils import EXT_IP
-from openstacknet_utils import EXT_OVS_VSCTL
from openstacknet_utils import INTEGRATION_BRIDGE
from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE
from openstacknet_utils import PLUGIN_TYPE_KEY
@@ -29,6 +28,7 @@
from openstacknet_utils import deviceExists
from openstacknet_utils import devName
from openstacknet_utils import executeOrExit
+from openstacknet_utils import ovs_vsctl
def disconnectVnic(portId):
@@ -40,7 +40,7 @@
executeOrExit([EXT_BRCTL, 'delif', brName, vethBr])
executeOrExit([EXT_IP, 'link', 'set', brName, 'down'])
executeOrExit([EXT_BRCTL, 'delbr', brName])
- executeOrExit([EXT_OVS_VSCTL, 'del-port', INTEGRATION_BRIDGE, vethOvs])
+ executeOrExit([ovs_vsctl.cmd, 'del-port', INTEGRATION_BRIDGE, vethOvs])
executeOrExit([EXT_IP, 'link', 'delete', vethOvs])
diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py
index 74f4671..e322ec3 100755
--- a/vdsm_hooks/openstacknet/before_device_create.py
+++ b/vdsm_hooks/openstacknet/before_device_create.py
@@ -40,7 +40,6 @@
from openstacknet_utils import DUMMY_BRIDGE
from openstacknet_utils import EXT_BRCTL
from openstacknet_utils import EXT_IP
-from openstacknet_utils import EXT_OVS_VSCTL
from openstacknet_utils import INTEGRATION_BRIDGE
from openstacknet_utils import OPENSTACK_NET_PROVIDER_TYPE
from openstacknet_utils import PLUGIN_TYPE_KEY
@@ -52,6 +51,7 @@
from openstacknet_utils import deviceExists
from openstacknet_utils import devName
from openstacknet_utils import executeOrExit
+from openstacknet_utils import ovs_vsctl
HELP_ARG = "-h"
TEST_ARG = "-t"
@@ -117,7 +117,7 @@
executeOrExit([EXT_BRCTL, 'addif', brName, vethBr])
mac = iface.getElementsByTagName('mac')[0].getAttribute('address')
- executeOrExit([EXT_OVS_VSCTL, '--', '--may-exist', 'add-port',
+ executeOrExit([ovs_vsctl.cmd, '--', '--may-exist', 'add-port',
INTEGRATION_BRIDGE, vethOvs,
'--', 'set', 'Interface', vethOvs,
'external-ids:iface-id=%s' % portId,
diff --git a/vdsm_hooks/openstacknet/openstacknet_utils.py b/vdsm_hooks/openstacknet/openstacknet_utils.py
index 686e4a0..5a75fb6 100644
--- a/vdsm_hooks/openstacknet/openstacknet_utils.py
+++ b/vdsm_hooks/openstacknet/openstacknet_utils.py
@@ -21,9 +21,9 @@
EXT_BRCTL = CommandPath('brctl', '/sbin/brctl', '/usr/sbin/brctl').cmd
EXT_IP = CommandPath('ip', '/sbin/ip').cmd
-EXT_OVS_VSCTL = CommandPath('ovs-vsctl',
- '/usr/sbin/ovs-vsctl',
- '/usr/bin/ovs-vsctl').cmd
+ovs_vsctl = CommandPath('ovs-vsctl',
+ '/usr/sbin/ovs-vsctl',
+ '/usr/bin/ovs-vsctl')
# Make pyflakes happy
DUMMY_BRIDGE
--
To view, visit http://gerrit.ovirt.org/25900
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I397e17782f61a94f734cf060d5ecad768379abcc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: libvirt_configure: persist cmd qemu-sanlock.conf
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: libvirt_configure: persist cmd qemu-sanlock.conf
......................................................................
libvirt_configure: persist cmd qemu-sanlock.conf
On a ovirt-node if executing vdsm-tool configure --force
with libvirt sanlock enabled it will set /etc/libvirt/qemu-sanlock.conf
but won't use persist command so next reboot the changes will be lost
and vdsm-tool will complain about libvirt not configured during vdsm start.
Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/25968/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index eacb37c..f2f7c2c 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -318,7 +318,12 @@
# persist cmd is ovirt_store_config on ovirt-functions
if isOvirtNode; then
. /usr/libexec/ovirt-functions
- ovirt_store_config "${lconf}" "${qconf}" "${ldconf}" "${llogr}"
+ ovirt_store_config \
+ "${lconf}" \
+ "${ldconf}" \
+ "${llogr}" \
+ "${qconf}" \
+ "${qlconf}"
fi
echo "Reconfiguration of libvirt is done."
--
To view, visit http://gerrit.ovirt.org/25968
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: vm: consider 'action' when handling I/O errors
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: vm: consider 'action' when handling I/O errors
......................................................................
vm: consider 'action' when handling I/O errors
When VDSM receives an I/O error event from libvirt,
it does not consider the value of the 'action' callback
field, and thus considers the guest CPU stopped.
This is true in the default configuration, which translates
to the disk write error policy 'stop', but not necessarily
true if the said policy is 'enospace'.
In this case the reported state of the CPU goes out of sync.
Since the error policy may be changed through an hook,
the safest thing to do is actually check the 'action'
value as reported by libvirt in the IOError callback.
This patch adds this check, and additional logging in
the case the guest CPU is reported running after I/O
errors.
Change-Id: I9299399c3e5bef7e6e3111aa35e3483827ad57da
Bug-Url: https://bugzilla.redhat.com/1064630
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M vdsm/clientIF.py
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/25157/1
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index f8fe499..0169e81 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -550,7 +550,12 @@
v._rtcUpdate(utcoffset)
elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON:
srcPath, devAlias, action, reason = args[:-1]
- v._onAbnormalStop(devAlias, reason)
+ if action == libvirt.VIR_DOMAIN_EVENT_IO_ERROR_PAUSE:
+ v._onAbnormalStop(devAlias, reason)
+ else:
+ self.log.warn('I/O error event on %s (%s) reason %s'
+ ' ignored due to action %i',
+ srcPath, devAlias, reason, action)
elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS:
phase, localAddr, remoteAddr, authScheme, subject = args[:-1]
v.log.debug('graphics event phase '
--
To view, visit http://gerrit.ovirt.org/25157
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9299399c3e5bef7e6e3111aa35e3483827ad57da
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
10 years, 2 months