Change in vdsm[master]: hostdev: add udev rules for USB devices
Martin Polednik has posted comments on this change.
Change subject: hostdev: add udev rules for USB devices
..
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 296: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 297: %s, out %s\nerr %s" % (guid, out, err))
Line 298:
Line 299: @logDecorator
Line 300: def udevTriggerUSB(self, bus, device):
> I don't see a need to backport half-baked api, and I don't want to support
Please see the followup - I believe that udevadm things belong to udevadm
module. Backport IS needed, because this is requirement (bug fix) for 3.6 USB
passthrough.
Line 301: self.__udevReloadRules('usb_' + '_'.join((bus, device)))
Line 302: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action',
'change',
Line 303:'--attr-match=busnum={}'.format(bus),
Line 304:'--attr-match=devnum={}'.format(device)]
--
To view, visit https://gerrit.ovirt.org/44679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Nir Soffer
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[master]: register: Add --ca-file
Douglas Schilling Landgraf has posted comments on this change. Change subject: register: Add --ca-file .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/44576 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie24793674569107148c832f0395807586044b95e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI 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[master]: register: Add --vdsm-uuid
Douglas Schilling Landgraf has posted comments on this change. Change subject: register: Add --vdsm-uuid .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/44431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5926b635201662db53956dbac18b9a2981d6e645 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI 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[master]: ceph: Report librbd1 version also on Debian
Nir Soffer has posted comments on this change. Change subject: ceph: Report librbd1 version also on Debian .. Patch Set 2: Needs a backport for 3.6. -- To view, visit https://gerrit.ovirt.org/44730 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Simone Tiraboschi 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[master]: ssl: runtime config to choose implementation
Nir Soffer has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/44689/2/lib/vdsm/jsonrpcvdscli.py File lib/vdsm/jsonrpcvdscli.py: Line 31 Line 32 Line 33 Line 34 Line 35 This boilerplate should appear once in compat.py. -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: ssl: configurable implementation
Nir Soffer has posted comments on this change.
Change subject: ssl: configurable implementation
..
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/44494/3/lib/vdsm/jsonrpcvdscli.py
File lib/vdsm/jsonrpcvdscli.py:
Line 31: from .config import config
Line 32: try:
Line 33: from . import m2cutils as sslutils
Line 34: except ImportError:
Line 35: from . import sslutils
Adding this import everywhere is not a good idea. This should be moved to the
compat module, so we can use:
from vdsm.compat import sslutils
And we get some implementation depending on the build and runtime settings.
Line 36:
Line 37:
Line 38: _COMMAND_CONVERTER = {
Line 39: 'ping': 'Host.ping',
--
To view, visit https://gerrit.ovirt.org/44494
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6501981bbd5276c49731b0d9eba4794286b0f823
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: Yeela Kaplan
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[master]: hostdev: add udev rules for USB devices
Nir Soffer has posted comments on this change.
Change subject: hostdev: add udev rules for USB devices
..
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 296: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 297: %s, out %s\nerr %s" % (guid, out, err))
Line 298:
Line 299: @logDecorator
Line 300: def udevTriggerUSB(self, bus, device):
> I agree. The tricky part is that we either refactor it first and then creat
I don't see a need to backport half-baked api, and I don't want to support this
in the field. We have the time to do this properly.
I think the best way would be:
- Remove unneeded stuff in supervdsm
- Move the implementation of udevTrigger() here to trigger()
- Refactor trigger() so it can serve both direct luns (guid) and usb devices
- Add the code using this new infrastructure
Line 301: self.__udevReloadRules('usb_' + '_'.join((bus, device)))
Line 302: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action',
'change',
Line 303:'--attr-match=busnum={}'.format(bus),
Line 304:'--attr-match=devnum={}'.format(device)]
--
To view, visit https://gerrit.ovirt.org/44679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Nir Soffer
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[master]: hostdev: add udev rules for USB devices
Martin Polednik has posted comments on this change.
Change subject: hostdev: add udev rules for USB devices
..
Patch Set 3:
(4 comments)
https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 296: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 297: %s, out %s\nerr %s" % (guid, out, err))
Line 298:
Line 299: @logDecorator
Line 300: def udevTriggerUSB(self, bus, device):
> We should not have such apis.
I agree. The tricky part is that we either refactor it first and then create
this patch, or create the patch and refactor it later. The first choice is in
my opinion a bit safer due to need for 3.6 backport.
Line 301: self.__udevReloadRules('usb_' + '_'.join((bus, device)))
Line 302: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action',
'change',
Line 303:'--attr-match=busnum={}'.format(bus),
Line 304:'--attr-match=devnum={}'.format(device)]
Line 394: @logDecorator
Line 395: def appropriateUSBDevice(self, bus, device):
Line 396: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device)
Line 397:
Line 398: rule = ('SUBSYSTEM=="usb", ATTRS{{busnum}}=="{}", '
> why not just use string concatenation and/or triple quoted strings?
consistence with other rules
Line 399: 'ATTRS{{devnum}}=="{}", '
Line 400: 'OWNER="{}", GROUP="{}"\n').format(
Line 401: bus, device, QEMU_PROCESS_USER,
QEMU_PROCESS_GROUP)
Line 402:
Line 425: def rmAppropriateUSBDevice(self, bus, device):
Line 426: self.releaseAppropriateUSBDevice(bus, device)
Line 427: # We need to give udev some time to handle the events in
queue before
Line 428: # deleting the rule.
Line 429: udevadm.settle(3)
> it exits when things are settled before reaching timeout. Please give a mor
Done
Line 430: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device)
Line 431:
Line 432: try:
Line 433: os.remove(rule_file)
Line 430: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device)
Line 431:
Line 432: try:
Line 433: os.remove(rule_file)
Line 434: except:
> this looks suspicious, could you please explain a bit?
Too generic, will fix that part. Other then that, it is something I'm not sure
we can handle (failure to delete the rule) BUT on the other hand, due to the
structure of rule (root->qemu->root) it should be safe to stay in place.
Line 435: raise
Line 436: else:
Line 437: self.log.debug("Removing rule %s", rule_file)
Line 438:
--
To view, visit https://gerrit.ovirt.org/44679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Nir Soffer
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[master]: gluster: Report glusterfs-cli package details
Nir Soffer has posted comments on this change. Change subject: gluster: Report glusterfs-cli package details .. Patch Set 3: Code-Review+2 We need to verify this also on Debian. Hopefully Simone can help with this. -- To view, visit https://gerrit.ovirt.org/44581 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id66bb578e56bdf5dc70759f62c1a1b68cd91d586 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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[master]: ceph: Report librbd1 version also on Debian
Nir Soffer has posted comments on this change. Change subject: ceph: Report librbd1 version also on Debian .. Patch Set 2: I don't have a debian machine around, hopefully someone with such machine can verify this patch. -- To view, visit https://gerrit.ovirt.org/44730 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Simone Tiraboschi 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[master]: caps: More readable and maintainable packages list
Nir Soffer has posted comments on this change. Change subject: caps: More readable and maintainable packages list .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/44731 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Simone Tiraboschi Gerrit-Reviewer: Yaniv Bronhaim 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[master]: register: Add --vdsm-uuid
automat...@ovirt.org has posted comments on this change. Change subject: register: Add --vdsm-uuid .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5926b635201662db53956dbac18b9a2981d6e645 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI 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[master]: register: Add --ca-file
automat...@ovirt.org has posted comments on this change. Change subject: register: Add --ca-file .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44576 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie24793674569107148c832f0395807586044b95e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI 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[master]: caps: More readable and maintainable packages list
Nir Soffer has uploaded a new change for review.
Change subject: caps: More readable and maintainable packages list
..
caps: More readable and maintainable packages list
Long lists that do not fit in one line are easier to work with when they
are formatted one item per line, and sorted. For example, diffs becomes
single line change, as can be seen in the next commit.
Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139
Signed-off-by: Nir Soffer
---
M vdsm/caps.py
1 file changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/44731/1
diff --git a/vdsm/caps.py b/vdsm/caps.py
index b443fab..450a58a 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -754,16 +754,15 @@
if getos() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL,
OSName.POWERKVM):
-KEY_PACKAGES = {'qemu-kvm': ('qemu-kvm', 'qemu-kvm-rhev',
- 'qemu-kvm-ev'),
-'qemu-img': ('qemu-img', 'qemu-img-rhev',
- 'qemu-img-ev'),
-'vdsm': ('vdsm',),
-'spice-server': ('spice-server',),
-'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
-'mom': ('mom',),
-'librbd1': ('librbd1',),
-}
+KEY_PACKAGES = {
+'librbd1': ('librbd1',),
+'libvirt': ('libvirt', 'libvirt-daemon-kvm'),
+'mom': ('mom',),
+'qemu-img': ('qemu-img', 'qemu-img-rhev', 'qemu-img-ev'),
+'qemu-kvm': ('qemu-kvm', 'qemu-kvm-rhev', 'qemu-kvm-ev'),
+'spice-server': ('spice-server',),
+'vdsm': ('vdsm',),
+}
if _glusterEnabled:
KEY_PACKAGES.update(GLUSTER_RPM_PACKAGES)
@@ -788,9 +787,14 @@
logging.error('', exc_info=True)
elif getos() == OSName.DEBIAN and python_apt:
-KEY_PACKAGES = {'qemu-kvm': 'qemu-kvm', 'qemu-img': 'qemu-utils',
-'vdsm': 'vdsmd', 'spice-server': 'libspice-server1',
-'libvirt': 'libvirt0', 'mom': 'mom'}
+KEY_PACKAGES = {
+'libvirt': 'libvirt0',
+'mom': 'mom',
+'qemu-img': 'qemu-utils',
+'qemu-kvm': 'qemu-kvm',
+'spice-server': 'libspice-server1',
+'vdsm': 'vdsmd',
+}
if _glusterEnabled:
KEY_PACKAGES.update(GLUSTER_DEB_PACKAGES)
--
To view, visit https://gerrit.ovirt.org/44731
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: ceph: Report librbd1 version also on Debian
automat...@ovirt.org has posted comments on this change. Change subject: ceph: Report librbd1 version also on Debian .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44730 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Simone Tiraboschi 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[master]: caps: More readable and maintainable packages list
automat...@ovirt.org has posted comments on this change. Change subject: caps: More readable and maintainable packages list .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44731 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia6dbf19b3842be6cfaf20eec8ba7356493f08139 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer 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[master]: ceph: Report librbd1 version also on Debian
automat...@ovirt.org has posted comments on this change. Change subject: ceph: Report librbd1 version also on Debian .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44730 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer 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[master]: ceph: Report librbd1 version also on Debian
Nir Soffer has uploaded a new change for review.
Change subject: ceph: Report librbd1 version also on Debian
..
ceph: Report librbd1 version also on Debian
In commit c447c3964e (ceph: Report librbd1 package details) Debian
support was missing. This patch add the missing configuration.
Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a
Signed-off-by: Nir Soffer
---
M vdsm/caps.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/44730/1
diff --git a/vdsm/caps.py b/vdsm/caps.py
index b443fab..8eba376 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -790,7 +790,8 @@
elif getos() == OSName.DEBIAN and python_apt:
KEY_PACKAGES = {'qemu-kvm': 'qemu-kvm', 'qemu-img': 'qemu-utils',
'vdsm': 'vdsmd', 'spice-server': 'libspice-server1',
-'libvirt': 'libvirt0', 'mom': 'mom'}
+'libvirt': 'libvirt0', 'mom': 'mom',
+'librbd1': 'librbd1'}
if _glusterEnabled:
KEY_PACKAGES.update(GLUSTER_DEB_PACKAGES)
--
To view, visit https://gerrit.ovirt.org/44730
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic97979fd208364f3e2009ab29930702688a42d5a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: ssl: runtime config to choose implementation
Nir Soffer has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/44689/2/vdsm.spec.in File vdsm.spec.in: Line 42 Line 43 Line 44 Line 45 Line 46 This is not clear - how about two flags: with_m2c - enable m2crypto with_ssl - enable builtin ssl Both can be 1 by default, allowing runtime configuration. If someone like to pack only one option, it is very easy. On Debian we will not enable m2c since we cannot support it. -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: debug: Make it easy to debug start failures
Nir Soffer has posted comments on this change. Change subject: debug: Make it easy to debug start failures .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/44728 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c47e289ce4d7d043d8d95887a3d645797270944 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim 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[master]: debug: Make it easy to debug start failures
automat...@ovirt.org has posted comments on this change. Change subject: debug: Make it easy to debug start failures .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44728 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c47e289ce4d7d043d8d95887a3d645797270944 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer 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[master]: debug: Make it easy to debug start failures
Nir Soffer has uploaded a new change for review.
Change subject: debug: Make it easy to debug start failures
..
debug: Make it easy to debug start failures
If Vdsm fail to start before logging was configured, it used to log a
message to syslog and exit silently. This make it hard to debug from the
shell.
This patch raises FatalError in the places that used to log to syslog
and exit. In the exception handler we log to syslog and re-raise the
exception, so the traceback is available in the shell, or in systemd
journal.
For example, instead of:
# /usr/share/vdsm/vdsm
(no output)
We get now:
# /usr/share/vdsm/vdsm
Traceback (most recent call last):
File "/usr/share/vdsm/vdsm", line 271, in
main()
File "/usr/share/vdsm/vdsm", line 253, in main
__assertVdsmUser()
File "/usr/share/vdsm/vdsm", line 230, in __assertVdsmUser
% (constants.VDSM_USER, username))
__main__.FatalError: Not running as 'vdsm', trying to run as 'root'
In the system log we will see this message:
Aug 11 20:58:34 hostname vdsm: VDSM failed to start: Not running as
'vdsm', trying to run as 'root'
Change-Id: I7c47e289ce4d7d043d8d95887a3d645797270944
Signed-off-by: Nir Soffer
---
M vdsm/vdsm
1 file changed, 23 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/44728/1
diff --git a/vdsm/vdsm b/vdsm/vdsm
index 0648562..9037c9e 100755
--- a/vdsm/vdsm
+++ b/vdsm/vdsm
@@ -54,6 +54,10 @@
logging.captureWarnings(True)
+class FatalError(Exception):
+""" Raised when vdsm fail to start """
+
+
def usage():
print("Usage: vdsm [OPTIONS]")
print(" -h - Display this help message")
@@ -113,8 +117,7 @@
try:
lconfig.fileConfig(loggerConfFile, disable_existing_loggers=False)
except RuntimeError as e:
-syslog.syslog('Failed to initialize logging: %s.' % e.message)
-sys.exit(1)
+raise FatalError("Cannot configure logging: %s" % e)
logging.addLevelName(5, 'TRACE')
logging.TRACE = 5 # impolite but helpful
@@ -209,8 +212,7 @@
def __assertLogPermission():
if not os.access(constants.P_VDSM_LOG, os.W_OK):
-syslog.syslog("vdsm log directory is not accessible")
-sys.exit(1)
+raise FatalError("Cannot access vdsm log dirctory")
logfile = constants.P_VDSM_LOG + "/vdsm.log"
if not os.path.exists(logfile):
@@ -218,21 +220,18 @@
return
if not os.access(logfile, os.W_OK):
-syslog.syslog("error in accessing vdsm log file")
-sys.exit(1)
+raise FatalError("Cannot access vdsm log file")
def __assertVdsmUser():
username = getpass.getuser()
if username != constants.VDSM_USER:
-syslog.syslog("VDSM failed to start: running user is not %s, trying "
- "to run from user %s" % (constants.VDSM_USER, username))
-sys.exit(1)
+raise FatalError("Not running as %r, trying to run as %r"
+ % (constants.VDSM_USER, username))
group = grp.getgrnam(constants.VDSM_GROUP)
if (constants.VDSM_USER not in group.gr_mem) and \
(pwd.getpwnam(constants.VDSM_USER).pw_gid != group.gr_gid):
-syslog.syslog("VDSM failed to start: vdsm user is not in KVM group")
-sys.exit(1)
+raise FatalError("Vdsm user is not in KVM group")
def __assertSudoerPermissions():
@@ -245,13 +244,12 @@
rc, _, stderr = utils.execCmd(cmd, sudo=True)
if rc != 0:
-syslog.syslog("vdsm user could not manage to run sudo operation: "
- "(stderr: %s). Verify sudoer rules configuration" %
- (stderr))
-sys.exit(1)
+raise FatalError("Vdsm user could not manage to run sudo operation: "
+ "(stderr: %s). Verify sudoer rules configuration" %
+ (stderr))
-if __name__ == '__main__':
+def main():
__assertVdsmUser()
__assertLogPermission()
__assertSudoerPermissions()
@@ -266,3 +264,12 @@
os.setpgrp()
argDict = parse_args()
run(**argDict)
+
+
+if __name__ == '__main__':
+try:
+main()
+except FatalError as e:
+syslog.syslog("VDSM failed to start: %s" % e)
+# Make it easy to debug via the shell
+raise
--
To view, visit https://gerrit.ovirt.org/44728
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c47e289ce4d7d043d8d95887a3d645797270944
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: debug: Remove unneeded coverage support
Nir Soffer has posted comments on this change. Change subject: debug: Remove unneeded coverage support .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/44725 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5b7c5eba1202e3db6a5fe1679806ca82ac0b076b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim 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[master]: debug: Remove unneeded coverage support
automat...@ovirt.org has posted comments on this change. Change subject: debug: Remove unneeded coverage support .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44725 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5b7c5eba1202e3db6a5fe1679806ca82ac0b076b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer 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[master]: debug: Remove unneeded coverage support
Nir Soffer has uploaded a new change for review.
Change subject: debug: Remove unneeded coverage support
..
debug: Remove unneeded coverage support
For testing code coverage, we can use nosetests --with-coverage options.
There is no need to pollute vdsm production code with special imports
that may cause silent failures in production.
Change-Id: I5b7c5eba1202e3db6a5fe1679806ca82ac0b076b
Signed-off-by: Nir Soffer
---
M vdsm/vdsm
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/44725/1
diff --git a/vdsm/vdsm b/vdsm/vdsm
index 0648562..9fe3af5 100755
--- a/vdsm/vdsm
+++ b/vdsm/vdsm
@@ -131,15 +131,6 @@
# plugin and we would like to print that out.
pass
-# Used to enable code coverage. On production machines
-# "coverage" should not exists and COVERAGE_PROCESS_START should not be
-# set.
-try:
-import coverage
-coverage.process_startup()
-except ImportError:
-pass
-
log = logging.getLogger('vds')
try:
logging.root.handlers.append(logging.StreamHandler())
--
To view, visit https://gerrit.ovirt.org/44725
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b7c5eba1202e3db6a5fe1679806ca82ac0b076b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: debug: Remove debug plugin
automat...@ovirt.org has posted comments on this change. Change subject: debug: Remove debug plugin .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44724 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaccdc337cb01e4576e8d201078e07e1e55665af1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer 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[master]: debug: Remove debug plugin
Nir Soffer has uploaded a new change for review.
Change subject: debug: Remove debug plugin
..
debug: Remove debug plugin
vdsmDebugPlugin was replaced by manhole, no need to keep and maintain
this now.
Change-Id: Iaccdc337cb01e4576e8d201078e07e1e55665af1
Signed-off-by: Nir Soffer
---
M debian/vdsm.install
M vdsm.spec.in
M vdsm/Makefile.am
D vdsm/debugPluginClient.py
M vdsm/vdsm
D vdsm/vdsmDebugPlugin.py
6 files changed, 0 insertions(+), 134 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/44724/1
diff --git a/debian/vdsm.install b/debian/vdsm.install
index a26c790..463376c 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -38,7 +38,6 @@
./usr/share/vdsm/caps.py
./usr/share/vdsm/clientIF.py
./usr/share/vdsm/daemonAdapter
-./usr/share/vdsm/debugPluginClient.py
./usr/share/vdsm/dmidecodeUtil.py
./usr/share/vdsm/dsaversion.py
./usr/share/vdsm/dumpStorageTable.py
@@ -139,7 +138,6 @@
./usr/share/vdsm/vdsm
./usr/share/vdsm/vdsm-restore-net-config
./usr/share/vdsm/vdsm-store-net-config
-./usr/share/vdsm/vdsmDebugPlugin.py
./usr/share/vdsm/vdsmapi-schema.json
./usr/share/vdsm/virt/__init__.py
./usr/share/vdsm/virt/domain_descriptor.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d17338d..0db7454 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -305,14 +305,6 @@
%description python
Shared libraries between the various VDSM packages.
-%package debug-plugin
-Summary:VDSM Debug Plugin
-Requires: %{name}
-Requires: %{name}-xmlrpc = %{version}-%{release}
-
-%description debug-plugin
-Used by the trained monkeys at Red Hat to insert chaos and mayhem in to VDSM.
-
%package tests
Summary:VDSM Test Suite
Requires: %{name} = %{version}-%{release}
@@ -1318,11 +1310,6 @@
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vmfex
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmfex
%endif
-
-%files debug-plugin
-%defattr(-, root, root, -)
-%{_datadir}/%{vdsm_name}/vdsmDebugPlugin.py*
-%{_datadir}/%{vdsm_name}/debugPluginClient.py*
%files cli
%defattr(-, root, root, -)
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c0578e..cf32bad 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -28,7 +28,6 @@
blkid.py \
caps.py \
clientIF.py \
- debugPluginClient.py \
dmidecodeUtil.py \
hooking.py \
hooks.py \
@@ -43,7 +42,6 @@
protocoldetector.py \
supervdsm.py \
v2v.py \
- vdsmDebugPlugin.py \
$(NULL)
dist_vdsmexec_SCRIPTS = \
diff --git a/vdsm/debugPluginClient.py b/vdsm/debugPluginClient.py
deleted file mode 100644
index 8b6b75e..000
--- a/vdsm/debugPluginClient.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright 2012 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-
-from multiprocessing.managers import BaseManager
-
-ADDRESS = "/var/run/vdsm/debugplugin.sock"
-
-
-class DebugInterpreterManager(BaseManager):
-pass
-
-
-def unindent(code):
-"""
-Unindent the code so that we can execute text that on the client side
-contains an extra indentation.
-"""
-i = 0
-
-for c in code:
-if c == '\n':
-i = 0
-elif c.isspace():
-i += 1
-else:
-break
-
-return ''.join([line[i:] for line in code.splitlines(True)])
-
-
-def execCode(code):
-manager = DebugInterpreterManager(address=ADDRESS, authkey="KEY")
-manager.register('interpreter')
-manager.connect()
-executor = manager.interpreter()
-executor.execute(unindent(code))
diff --git a/vdsm/vdsm b/vdsm/vdsm
index 0648562..7279ed1 100755
--- a/vdsm/vdsm
+++ b/vdsm/vdsm
@@ -119,18 +119,6 @@
logging.addLevelName(5, 'TRACE')
logging.TRACE = 5 # impolite but helpful
-# Used to debug vdsm. on production machines
-# vdsmDebugPlugin.py should not exists
-try:
-import vdsmDebugPlugin
-vdsmDebugPlugin.turnOnDebugPlugin()
-except ImportError:
-# This is OK, it just means the file isn't
-# there and we are not running in debug mode.
-# Any other error is an error in the debug
-# plu
Change in vdsm[master]: vm: Improve error handling when Vm._dom is None
Nir Soffer has posted comments on this change. Change subject: vm: Improve error handling when Vm._dom is None .. Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/43225/3/vdsm/virt/sampling.py File vdsm/virt/sampling.py: Line 551: self._skip_doms[vm_id] = True Line 552: else: Line 553: # TODO: This racy check may fail if the underlying libvirt Line 554: # domain has died just after checking isDomainReadyForCommands Line 555: # succeeded. > note to self: fix in a future patch The issue is is not only accessing private of a private (extremely evil :-), but the fact that vm_obj._dom may be replaced behind your back with DisconnectedDomain, while you hold the old object, so the call you do later may use a invalid object or one that we should not access. You should add vm_obj to the list, and handle DisconnectedError if the vm was disconnected while the periodic loop was trying to access it. Line 556: doms.append(vm_obj._dom._dom) Line 557: return doms Line 558: Line 559: -- To view, visit https://gerrit.ovirt.org/43225 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5349ec51c7accf3b417b3bc9489c7eed5bfd8733 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Daniel Erez Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Vinzenz Feenstra 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[master]: supervdsm: move udev functions to udevadm module
Nir Soffer has posted comments on this change.
Change subject: supervdsm: move udev functions to udevadm module
..
Patch Set 1: Code-Review-1
(10 comments)
Thanks for this cleanup!
https://gerrit.ovirt.org/#/c/44684/1/lib/vdsm/udevadm.py
File lib/vdsm/udevadm.py:
Line 23: import errno
Line 24:
Line 25: from . import utils
Line 26:
Line 27: from vdsm.constants import EXT_UDEVADM
Why do you need EXT_UDEVADM, when this module is finding udevadm via
CommandPath?
Line 28:
Line 29: _UDEVADM = utils.CommandPath("udevadm", "/sbin/udevadm",
"/usr/sbin/udevadm")
Line 30: _UDEV_WITH_RELOAD_VERSION = 181
Line 31:
Line 26:
Line 27: from vdsm.constants import EXT_UDEVADM
Line 28:
Line 29: _UDEVADM = utils.CommandPath("udevadm", "/sbin/udevadm",
"/usr/sbin/udevadm")
Line 30: _UDEV_WITH_RELOAD_VERSION = 181
Unneeded
Line 31:
Line 32:
Line 33: class Error(Exception):
Line 34:
Line 66: logging.error("%s", e)
Line 67:
Line 68:
Line 69: def has_reload():
Line 70: return version() > _UDEV_WITH_RELOAD_VERSION
This is not needed any more, we support only el7 (version 208) and fedora >= 21
(version 216).
Line 71:
Line 72:
Line 73: def reload_rules(device_name):
Line 74: if has_reload():
Line 69: def has_reload():
Line 70: return version() > _UDEV_WITH_RELOAD_VERSION
Line 71:
Line 72:
Line 73: def reload_rules(device_name):
device_name is unused, we should not pass unneeded parameters, to add context
to the error. The caller should log this properly.
Rename to reload(), as recent udevadm uses this term.
Line 74: if has_reload():
Line 75: reload = "--reload"
Line 76: else:
Line 77: reload = "--reload-rules"
Line 73: def reload_rules(device_name):
Line 74: if has_reload():
Line 75: reload = "--reload"
Line 76: else:
Line 77: reload = "--reload-rules"
we always have reload
Line 78: cmd = [EXT_UDEVADM, 'control', reload]
Line 79: rc, out, err = utils.execCmd(cmd)
Line 80: if rc:
Line 81: raise OSError(errno.EINVAL, "Could not reload-rules for device
"
Line 78: cmd = [EXT_UDEVADM, 'control', reload]
Line 79: rc, out, err = utils.execCmd(cmd)
Line 80: if rc:
Line 81: raise OSError(errno.EINVAL, "Could not reload-rules for device
"
Line 82: "%s" % device_name)
Use _run_command()
Never fake OSError. We have bad code doing this but we should fix that code,
not add new evil errors.
Line 83:
Line 84:
Line 85: @utils.memoized
Line 86: def version():
Line 87: cmd = [EXT_UDEVADM, '--version']
Line 88: rc, out, err = utils.execCmd(cmd)
Line 89: if rc:
Line 90: raise RuntimeError("Could not get udev version number")
Line 91: return int(out[0])
Do we need this after removing has_reload?
If this is needed only for infrequent use, don't memoize it so it continue to
work after upgrading udevadm.
If keeping this, raise Error(). Don't use RuntimeError does not help any one.
Line 92:
Line 93:
Line 94: def _run_command(args):
Line 95: cmd = [_UDEVADM.cmd]
Line 98: if rc != 0:
Line 99: raise Error(rc, out, err)
Line 100:
Line 101:
Line 102: def udev_trigger(guid):
Rename to trigger(), make the interface generic so we can use it for all type
of calls.
Line 103: reload_rules(guid)
Line 104: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action', 'change',
Line 105:'--property-match=DM_NAME=%s' % guid]
Line 106: rc, out, err = utils.execCmd(cmd)
Line 105:'--property-match=DM_NAME=%s' % guid]
Line 106: rc, out, err = utils.execCmd(cmd)
Line 107: if rc:
Line 108: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 109: %s, out %s\nerr %s" % (guid, out, err))
Use _run_command()
Fix the callers to handle udevadm.Error instead of this fake OSError.
Line 110:
Line 111:
Line 112: def udev_trigger_usb(bus, device):
Line 113: reload_rules('usb_' + '_'.join((bus, device)))
Line 108: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 109: %s, out %s\nerr %s" % (guid, out, err))
Line 110:
Line 111:
Line 112: def udev_trigger_usb(bus, device):
Unneeded, trigger() should be good enough to do what you need.
Line 113: reload_rules('usb_' + '_'.join((bus, device)))
Line 114: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action', 'change',
Line 115:'--attr-match=busnum={}'.format(bus),
Line 116:'--attr-match=devnum={}'.format(device)]
--
To view, visit https://gerrit.ovirt.org/44684
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id9fecbf0e605e0dd6644b005f00ceedffe46d8d0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Ha
Change in vdsm[master]: register: Add --vdsm-uuid option
Dan Kenigsberg has posted comments on this change. Change subject: register: Add --vdsm-uuid option .. Patch Set 3: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/44431/3/lib/vdsm/tool/register.py File lib/vdsm/tool/register.py: Line 451: ) Line 452: Line 453: parser.add_argument( Line 454: '--vdsm-uuid', Line 455: help="Enforce VDSM UUID.", "Enforce" is very vague. How about using (here and elsewhere) something along lthe lines of "provide host uuid to be used instead vdsm.utils' default. useful for hosts with blank or buggy dmi" Line 456: ) Line 457: Line 458: # Using [1:] to remove the 'register' option from arguments Line 459: # and avoid vdsm-tool recognize it as an unknown option -- To view, visit https://gerrit.ovirt.org/44431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5926b635201662db53956dbac18b9a2981d6e645 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Fabian Deutsch Gerrit-Reviewer: Jenkins CI 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[master]: hostdev: add udev rules for USB devices
Nir Soffer has posted comments on this change.
Change subject: hostdev: add udev rules for USB devices
..
Patch Set 3: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 296: raise OSError(errno.EINVAL, "Could not trigger change for
device \
Line 297: %s, out %s\nerr %s" % (guid, out, err))
Line 298:
Line 299: @logDecorator
Line 300: def udevTriggerUSB(self, bus, device):
We should not have such apis.
We should change the udevTrigger api to be more generic, accepting the required
options that "udevadm trigger" accepts, so different code can use the same api
to trigger events.
For example, the guid parameter to udevTrigger does not make sense, and should
be replaced with the proper generic option like:
def udevTrigger(self, properties_match=()):
...
To trigger a device with guid, the caller should do:
udevTrigger(properties_match=["DM_NAME=xxxyyy"])
Which will generate this command line option:
--property-match="DM_NAME=xxxyyy"
Line 301: self.__udevReloadRules('usb_' + '_'.join((bus, device)))
Line 302: cmd = [EXT_UDEVADM, 'trigger', '--verbose', '--action',
'change',
Line 303:'--attr-match=busnum={}'.format(bus),
Line 304:'--attr-match=devnum={}'.format(device)]
--
To view, visit https://gerrit.ovirt.org/44679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Nir Soffer
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[master]: Live Merge: Fix pre-extension calculation for chunked drives
automat...@ovirt.org has posted comments on this change. Change subject: Live Merge: Fix pre-extension calculation for chunked drives .. Patch Set 2: * Update tracker::#1240360::OK * Check Bug-Url::OK * Check Public Bug::#1240360::OK, public bug * Check Product::#1240360::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44331 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I959608dc2f5a71afca605610267478e8a16e2c4b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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[master]: Live Merge: Fix pre-extension calculation for chunked drives
Adam Litke has posted comments on this change. Change subject: Live Merge: Fix pre-extension calculation for chunked drives .. Patch Set 1: (3 comments) https://gerrit.ovirt.org/#/c/44331/1//COMMIT_MSG Commit Message: Line 13: qcow2 volume as a result of the writes. The amount of growth can be Line 14: anywhere between 0 (if all writes are replacing old data) and the Line 15: allocated size of the top volume (if all writes target unallocated Line 16: blocks in the base volume). If the top volume is the active layer the Line 17: gamount of rowth required could be more due to writes from the VM that > gamount of rowth -> amount of growth Done Line 18: come after this calculation is performed. Line 19: Line 20: To prevent live merge failures when the base volume's LV is too small we Line 21: request an extension to accomodate the worst case scenario and increase Line 20: To prevent live merge failures when the base volume's LV is too small we Line 21: request an extension to accomodate the worst case scenario and increase Line 22: the base volume's LV by the size of the top volume's LV plus one Line 23: additional chunk. The LV will never be increased beyond the actual Line 24: capacity of the VM disk. > For active layer merge, we can extend the base volume when we extend the ac This sounds like a different patch to me. Line 25: Line 26: The old code extended the base volume's LV to the size of the top Line 27: volume's LV which does not cover all the possible scenarios. Line 28: https://gerrit.ovirt.org/#/c/44331/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 4726: # the allocated size of 'top' plus one additional chunk to accomodate Line 4727: # additional writes to 'top' during the live merge operation. Line 4728: if drive.chunked: Line 4729: capacity, alloc, physical = self._getExtendInfo(drive) Line 4730: targetSize = baseSize + topSize > Lets rename this to maxAlloc, which explain this calculation better. Done Line 4731: self.extendDriveVolume(drive, baseVolUUID, targetSize, capacity) Line 4732: Line 4733: # Trigger the collection of stats before returning so that callers Line 4734: # of getVmStats after this returns will see the new job -- To view, visit https://gerrit.ovirt.org/44331 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I959608dc2f5a71afca605610267478e8a16e2c4b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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[master]: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API
automat...@ovirt.org has posted comments on this change. Change subject: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API .. Patch Set 1: * Update tracker::#1048696::OK -- To view, visit https://gerrit.ovirt.org/38421 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I583c0493093d2c9c8bca8713df8ee123c415de7f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Candace Sheremeta Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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[master]: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API
Idan Shaby has abandoned this change. Change subject: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API .. Abandoned This patch will cause problems in the engine side. For further explanations, please see the discussion in hsm.py. -- To view, visit https://gerrit.ovirt.org/38421 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I583c0493093d2c9c8bca8713df8ee123c415de7f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan Shaby Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Candace Sheremeta Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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[master]: v2v: get VM information from OVA file
Adam Litke has posted comments on this change.
Change subject: v2v: get VM information from OVA file
..
Patch Set 9: Code-Review-1
(2 comments)
https://gerrit.ovirt.org/#/c/43271/9/vdsm/rpc/vdsmapi-schema.json
File vdsm/rpc/vdsmapi-schema.json:
Line 3965: ##
Line 3966: {'command': {'class': 'Host', 'name': 'getExternalVmFromOva'},
Line 3967: 'data': {'ova_path': 'str'},
Line 3968: 'returns': ['ExternalVmInfo']}
Line 3969:
Oops. You never define the 'ExternalVmInfo' type. Also, why are you returning
an array? You always pass in a single OVA path so it seems impossible that you
could ever have multiple ExternalVMInfo objects to return from this call.
Line 3970:
Line 3971: ##
Line 3972: # @Host.convertExternalVm:
Line 3973: #
https://gerrit.ovirt.org/#/c/43271/9/vdsm/v2v.py
File vdsm/v2v.py:
Line 699: vm['vmName'] = vmName.text
Line 700: else:
Line 701: raise V2VError('Error parsing ovf information: no ovf:Name')
Line 702:
Line 703: memSize = node.find('.//ovf:Item[rasd:ResourceType="4"]/'
ResouceType="4" <-- seems we should have some constants defined for these.
Line 704: 'rasd:VirtualQuantity', ns)
Line 705: if memSize is not None:
Line 706: vm['memSize'] = int(memSize.text)
Line 707: else:
--
To view, visit https://gerrit.ovirt.org/43271
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3c55c846f837bb5bf363717e05daabf5ee6631ca
Gerrit-PatchSet: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi
Gerrit-Reviewer: Adam Litke
Gerrit-Reviewer: Arik Hadas
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Federico Simoncelli
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Shahar Havivi
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[master]: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API
Idan Shaby has posted comments on this change.
Change subject: lvm: Update hsm.__processVGInfos() with lvm.getPV() new API
..
Patch Set 1:
(1 comment)
https://gerrit.ovirt.org/#/c/38421/1/vdsm/storage/hsm.py
File vdsm/storage/hsm.py:
Line 3003: try:
Line 3004: pvInfo = lvm.getPV(pv)
Line 3005: except se.InaccessiblePhysDev:
Line 3006: self.log.error("PV %s no longer exists", pv)
Line 3007: continue
> What if you catch InaccessiblePhysDev and you take the entire vg out of the
I ran a few tests. Here are the results when trying to add an iscsi domain:
1. A test that makes getPV in lvm.py always fail (raise an
InaccessiblePhysDev), which is the scenario that can most probably happen today
- fails with the error "Error while executing action New SAN Storage Domain:
Multipath cannot access physical device".
There was no db pollution.
2. A test that makes getPV in lvm.py fail only for a specific pv - same error
is shown, and no db pollution.
3. A test that removes the vg out of the vg list (what Fede suggested) - the
storage domain is created, a new record is added to the storage_domain_static
table but the lun (the only one) is not added to the luns table.
That means that we saved a partial information in the db (db pollution).
If you create another storage domain, you will see the luns that you used
earlier as free luns (not greyed out), and if you try to edit the storage
domain that we created, you will get a bunch of
java.lang.NullPointerException-s.
I am abandoning the patch.
Line 3008: vgInfo['pvlist'].append(self.__fillPVDict(dev,
pvInfo, vgType))
Line 3009:
Line 3010: if vgType == multipath.DEV_FCP:
Line 3011: vgType = sd.FCP_DOMAIN
--
To view, visit https://gerrit.ovirt.org/38421
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I583c0493093d2c9c8bca8713df8ee123c415de7f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Idan Shaby
Gerrit-Reviewer: Adam Litke
Gerrit-Reviewer: Ala Hino
Gerrit-Reviewer: Allon Mureinik
Gerrit-Reviewer: Candace Sheremeta
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Federico Simoncelli
Gerrit-Reviewer: Freddy Rolland
Gerrit-Reviewer: Idan Shaby
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: Tal Nisan
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[master]: v2v: import abort/done status fix
automat...@ovirt.org has posted comments on this change. Change subject: v2v: import abort/done status fix .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/44470 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6fc3febe19a9602df63fa414edf7446a02416c66 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi 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[master]: v2v: import abort/done status fix
Adam Litke has submitted this change and it was merged. Change subject: v2v: import abort/done status fix .. v2v: import abort/done status fix when importing is done need to check if the user aborted, if so no need to change the job status to done. Change-Id: I6fc3febe19a9602df63fa414edf7446a02416c66 Signed-off-by: Shahar Havivi Reviewed-on: https://gerrit.ovirt.org/44470 Continuous-Integration: Jenkins CI Tested-by: Shahar Havivi Reviewed-by: Francesco Romani --- M vdsm/v2v.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Shahar Havivi: Verified Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/44470 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fc3febe19a9602df63fa414edf7446a02416c66 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi 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[master]: net: tests: move veth.pair into nettestlib.py
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: move veth.pair into nettestlib.py .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44697 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic976754b5b8f41de6d8267a8df17bc6706c9e6af Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horacek 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[master]: net: tests: wip first real tc test
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: wip first real tc test
..
net: tests: wip first real tc test
Change-Id: Ibad639a9ad04593cfd477f60a8272614f3446522
Signed-off-by: Ido Barkan
---
M tests/tcTests.py
1 file changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/44699/1
diff --git a/tests/tcTests.py b/tests/tcTests.py
index e84d96c..c17df93 100644
--- a/tests/tcTests.py
+++ b/tests/tcTests.py
@@ -30,10 +30,11 @@
from testlib import VdsmTestCase as TestCaseBase
from testValidation import ValidateRunningAsRoot
-from nettestlib import Bridge, Tap, requires_brctl, requires_tc
+from nettestlib import Bridge, Dummy, Tap, requires_tc
from vdsm.constants import EXT_TC
from network import tc
+from network.configurators import qos
class TestQdisc(TestCaseBase):
@@ -352,3 +353,26 @@
tc.setPortMirroring(self._bridge0.devName, self._bridge2.devName)
self.testMirroring()
tc.unsetPortMirroring(self._bridge0.devName, self._bridge2.devName)
+
+
+class TestConfigureOutbound(TestCaseBase):
+def setUp(self):
+self.device = Dummy()
+self.device.create()
+
+# TODO:
+# test with/without vlan (see filters are right) and classes are on correct
+# devices (use tc.filters/tc.classes for this)
+
+def tearDown(self):
+self.device.remove()
+
+def test_sanity(self):
+host_qos_outbound = {
+'ls': {
+'m1': 4 * 1000 ** 2, # 4Mbit/s
+'d': 100 * 1000, # 100 microseconds
+'m2': 3 * 1000 ** 2}, # 3Mbit/s
+'ul': {
+'m2': 8 * 1000 ** 2}} # 8Mbit/s
+qos.configure_outbound(host_qos_outbound, top_device=self.device)
\ No newline at end of file
--
To view, visit https://gerrit.ovirt.org/44699
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibad639a9ad04593cfd477f60a8272614f3446522
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: tests: wip first real tc test
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: wip first real tc test .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44699 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibad639a9ad04593cfd477f60a8272614f3446522 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan 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[master]: net: tests: fix testSelectiveRestoreDuringUpgrade
Dan Kenigsberg has posted comments on this change. Change subject: net: tests: fix testSelectiveRestoreDuringUpgrade .. Patch Set 2: Code-Review+2 raising. please backport to 3.6! -- To view, visit https://gerrit.ovirt.org/44624 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2fc4bd069d5c5980329dc4a53f5194625d8a767a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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[master]: net: tests: fix testSelectiveRestoreDuringUpgrade
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: tests: fix testSelectiveRestoreDuringUpgrade .. net: tests: fix testSelectiveRestoreDuringUpgrade There were mixed bonds' slaves on assertion. Now it's fixed. Change-Id: I2fc4bd069d5c5980329dc4a53f5194625d8a767a Signed-off-by: Petr Horáček Reviewed-on: https://gerrit.ovirt.org/44624 Reviewed-by: Ido Barkan Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg --- M tests/functional/networkTests.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Ido Barkan: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Petr Horáček: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/44624 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fc4bd069d5c5980329dc4a53f5194625d8a767a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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[master]: net: tests: fix testSelectiveRestoreDuringUpgrade
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: fix testSelectiveRestoreDuringUpgrade .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/44624 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2fc4bd069d5c5980329dc4a53f5194625d8a767a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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[master]: storage: don't chmod local storage symlink
automat...@ovirt.org has posted comments on this change. Change subject: storage: don't chmod local storage symlink .. Patch Set 4: * Update tracker::#1112171::OK * Check TR::#1112171::ERROR, 3.6.0 should not match .* -- To view, visit https://gerrit.ovirt.org/6 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If1009033d7cb32add02c9bcc19840c601ea70b4e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Greg Padgett Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Greg Padgett Gerrit-Reviewer: Greg Padgett Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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[master]: v2v: Abort job need not to clean the job
Dan Kenigsberg has submitted this change and it was merged. Change subject: v2v: Abort job need not to clean the job .. v2v: Abort job need not to clean the job When aborting a v2v job there is no need to delete it from the job collection. (The job deletion will be handled by the engine) Change-Id: Iba9b4c1abba829c269339dfcae8eec38a301e1f2 Signed-off-by: Shahar Havivi Reviewed-on: https://gerrit.ovirt.org/44345 Reviewed-by: Francesco Romani Continuous-Integration: Jenkins CI Tested-by: Shahar Havivi --- M vdsm/v2v.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Shahar Havivi: Verified Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/44345 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba9b4c1abba829c269339dfcae8eec38a301e1f2 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Arik Hadas Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Shahar Havivi 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[master]: v2v: Abort job need not to clean the job
automat...@ovirt.org has posted comments on this change. Change subject: v2v: Abort job need not to clean the job .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44345 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iba9b4c1abba829c269339dfcae8eec38a301e1f2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Arik Hadas Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Shahar Havivi 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[master]: v2v: Abort job need not to clean the job
automat...@ovirt.org has posted comments on this change. Change subject: v2v: Abort job need not to clean the job .. Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/44345 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iba9b4c1abba829c269339dfcae8eec38a301e1f2 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Arik Hadas Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Shahar Havivi 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[master]: storage: don't chmod local storage symlink
Dan Kenigsberg has submitted this change and it was merged. Change subject: storage: don't chmod local storage symlink .. storage: don't chmod local storage symlink Proper permissions for the local storage target directory are already verified before the local storage is connected, so there is no need to change the permissions once the symlink has been created. Additionally, there is no need to change the permissions of the symlink itself. From 'man 1 chmod': chmod never changes the permissions of symbolic links; the chmod system call cannot change their permissions. This is not a problem since the permissions of symbolic links are never used. The chmod call was added in 93390aab8381bff869bd029bf121f6a1f3761e8e in a large patch with both refactoring changes and updates to the way permissions were checked for storage. However, the chmod is not needed and is effectively redundant with the validation that runs when storage is connected. Change-Id: If1009033d7cb32add02c9bcc19840c601ea70b4e Bug-Url: https://bugzilla.redhat.com/1112171 Signed-off-by: Greg Padgett Reviewed-on: https://gerrit.ovirt.org/6 Continuous-Integration: Jenkins CI Reviewed-by: Nir Soffer Tested-by: Greg Padgett --- M vdsm/storage/storageServer.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Nir Soffer: Looks good to me, approved Jenkins CI: Passed CI tests Greg Padgett: Verified -- To view, visit https://gerrit.ovirt.org/6 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1009033d7cb32add02c9bcc19840c601ea70b4e Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Greg Padgett Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Greg Padgett Gerrit-Reviewer: Greg Padgett Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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[master]: vm: Improve error handling when Vm._dom is None
automat...@ovirt.org has posted comments on this change. Change subject: vm: Improve error handling when Vm._dom is None .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/43225 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5349ec51c7accf3b417b3bc9489c7eed5bfd8733 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Daniel Erez Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Vinzenz Feenstra 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[master]: vm: Improve error handling when Vm._dom is None
Dan Kenigsberg has submitted this change and it was merged. Change subject: vm: Improve error handling when Vm._dom is None .. vm: Improve error handling when Vm._dom is None Vm._dom is initialized to None on when creating a vm, and set to None if the underlying libvirt domain has died. Since Vm._dom is modified by multiple threads, it is impossible to check for None before using it. Even if it was possible, we don't want to litter the code with None checks everywhere. Some code was using this pattern: try: self._dom.doSomething() except AttributeError: # Oh, it was None This code is not communicating well our intent. Worse, it hides AttributeError in doSomthing()! Most code never check self._dom before using it. In the rare cases it is None, we fail with this Traceback: Thread-460::ERROR::2015-07-04 19:53:21,977::__init__::520::jsonrpc.JsonRpcServer::(_serveRequest) Internal server error Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/yajsonrpc/__init__.py", line 515, in _serveRequest res = method(**params) File "/usr/share/vdsm/rpc/Bridge.py", line 277, in _dynamicMethod result = fn(*methodArgs) File "/usr/share/vdsm/API.py", line 727, in freeze return v.freeze() File "/usr/share/vdsm/virt/vm.py", line 2882, in freeze frozen = self._dom.fsFreeze() AttributeError: 'NoneType' object has no attribute 'fsFreeze' This traceback is a poor way to say "the vm is not running". This patch introduces the DisconnectedVirDomain class. This object will raise NotConnectedError for any attribute access. Vm._dom is initialzied to DisconnectedVirDomain(vmid) on startup and after underlying libvirt domain has died. Code trying to talk with a dead vm will fail now with: NotConnectedError: Vm '681f6b09-a9c3-4422-a7e2-2f607368718b' is not running yet or was shut down. Code handling disconnected state is using now: try: self._dom.doSomething() except NotConnctedError: ... This communicates our intent, and does not hide any error from the underlying code. Code checking for None is using now: if self._dom.connected: ... Change-Id: I5349ec51c7accf3b417b3bc9489c7eed5bfd8733 Signed-off-by: Nir Soffer Reviewed-on: https://gerrit.ovirt.org/43225 Continuous-Integration: Jenkins CI Reviewed-by: Vinzenz Feenstra Reviewed-by: Francesco Romani --- M tests/vmTests.py M tests/vmfakelib.py M vdsm/virt/sampling.py M vdsm/virt/vm.py 4 files changed, 47 insertions(+), 20 deletions(-) Approvals: Nir Soffer: Verified Jenkins CI: Passed CI tests Vinzenz Feenstra: Looks good to me, but someone else must approve Francesco Romani: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/43225 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5349ec51c7accf3b417b3bc9489c7eed5bfd8733 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Daniel Erez Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Vinzenz Feenstra 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[master]: ssl: configurable implementation
Piotr Kliczewski has posted comments on this change. Change subject: ssl: configurable implementation .. Patch Set 3: Verified+1 Verified all 3 patches together by building with_m2c both with 0 and 1. Installed both build and seeing that communication is OK. For option 1 I tested both implementations by setting both implementation in config py and restarting vdsm. CI failures are not related to these patches. -- To view, visit https://gerrit.ovirt.org/44494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6501981bbd5276c49731b0d9eba4794286b0f823 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: m2c: rename m2c modules
Piotr Kliczewski has posted comments on this change. Change subject: m2c: rename m2c modules .. Patch Set 2: Verified all 3 patches together by building with_m2c both with 0 and 1. Installed both build and seeing that communication is OK. For option 1 I tested both implementations by setting both implementation in config py and restarting vdsm. CI failures are not related to these patches. -- To view, visit https://gerrit.ovirt.org/44493 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fa842cb7a1ac0b2593df6f6fe67eee118a50616 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: ssl: runtime config to choose implementation
Piotr Kliczewski has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 2: Verified all 3 patches together by building with_m2c both with 0 and 1. Installed both build and seeing that communication is OK. For option 1 I tested both implementations by setting both implementation in config py and restarting vdsm. CI failures are not related to these patches. -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski 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[master]: ssl: runtime config to choose implementation
Piotr Kliczewski has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski 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[master]: net: tests: move Dummy class into nettestlib.py
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: move Dummy class into nettestlib.py .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44696 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6629e65a11e095378a91ed3f97f6be33b9b56357 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: mov veth.pair into nettestlib.py
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: mov veth.pair into nettestlib.py .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44697 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic976754b5b8f41de6d8267a8df17bc6706c9e6af Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: use ipwrapper functions in nettestlib
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: use ipwrapper functions in nettestlib .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44694 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3b27fc3a39ac289edeffb3f658070944933b2b4c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: new style classes in nettestlib
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: new style classes in nettestlib .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44692 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I08bfb2f9e015fb98d47eeaff794f47d43d078b12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: rename Interface methods.
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: rename Interface methods. .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44693 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8c667c11d709f9f888554bb4800dabb61097828a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: convert dummy module into a class
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: convert dummy module into a class .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44695 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie9c671cb0cf4b5e2e67090861e2018c90f0f95f8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: net: tests: move Dummy class into nettestlib.py
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: move Dummy class into nettestlib.py
..
net: tests: move Dummy class into nettestlib.py
One additional step in unifying code of test interfaces management code
Change-Id: I6629e65a11e095378a91ed3f97f6be33b9b56357
Signed-off-by: Ido Barkan
---
D tests/functional/dummy.py
M tests/functional/networkTests.py
M tests/netinfoTests.py
M tests/netlinkTests.py
M tests/nettestlib.py
M tests/samplingTests.py
6 files changed, 103 insertions(+), 136 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/44696/1
diff --git a/tests/functional/dummy.py b/tests/functional/dummy.py
deleted file mode 100644
index 46c7dac..000
--- a/tests/functional/dummy.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-from contextlib import contextmanager
-
-from nose.plugins.skip import SkipTest
-
-from vdsm.ipwrapper import linkAdd, linkDel, addrAdd, linkSet, IPRoute2Error
-from vdsm.utils import random_iface_name
-
-
-class Dummy(object):
-
-def __init__(self, prefix='dummy_', max_length=11):
-self.devName = random_iface_name(prefix, max_length)
-
-def create(self):
-"""
-Create a dummy interface with a pseudo-random suffix, e.g.
-dummy_ilXaYiSn7.
-Limit the name to 11 characters to make room for VLAN IDs.
-This assumes root privileges.
-"""
-try:
-linkAdd(self.devName, linkType='dummy')
-except IPRoute2Error as e:
-raise SkipTest('Failed to create a dummy interface %s: %s' %
- (self.devName, e))
-else:
-return self.devName
-
-def remove(self):
-"""
-Remove the dummy interface. This assumes root privileges.
-"""
-
-try:
-linkDel(self.devName)
-except IPRoute2Error as e:
-raise SkipTest("Unable to delete the dummy interface %s: %s" %
- (self.devName, e))
-
-def setLinkUp(self):
-self._setLinkState('up')
-
-def setLinkDown(self):
-self._setLinkState('down')
-
-def setIP(self, ipaddr, netmask, family=4):
-try:
-addrAdd(self.devName, ipaddr, netmask, family)
-except IPRoute2Error as e:
-message = ('Failed to add the IPv%s address %s/%s to device %s: %s'
- % (family, ipaddr, netmask, self.devName, e))
-if family == 6:
-message += ("; NetworkManager may have set the sysctl "
-"disable_ipv6 flag on the device, please see e.g. "
-"RH BZ #1102064")
-raise SkipTest(message)
-
-def _setLinkState(self, state):
-try:
-linkSet(self.devName, [state])
-except IPRoute2Error:
-raise SkipTest('Failed to bring %s to state %s' % (
-self.devName, state))
-
-
-@contextmanager
-def device(prefix='dummy_', max_length=11):
-dummy_interface = Dummy(prefix, max_length)
-dummy_name = dummy_interface.create()
-try:
-yield dummy_name
-finally:
-dummy_interface.remove()
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 10b4426..a45f800 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -49,10 +49,9 @@
expandPermutations, permutations)
from testValidation import (brokentest, slowtest, RequireDummyMod,
RequireVethMod, ValidateRunningAsRoot)
-from nettestlib import Tap
+from nettestlib import Dummy, Tap
import dhcp
-import dummy
import firewall
import veth
from utils import SUCCESS, VdsProxy
@@ -97,9 +96,9 @@
"""Persists network configuration."""
VdsProxy().save_config()
for _ in range(DUMMY_POOL_SIZE):
-iface = dummy.Dummy()
-iface.create()
-dummyPool.add(iface)
+dummy = Dummy()
+dummy.create()
+dummyPool.add(dummy)
def tearDownModule():
@@ -2540,9 +2539,9 @@
@cleanupNet
def testS
Change in vdsm[master]: net: tests: use ipwrapper functions in nettestlib
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: use ipwrapper functions in nettestlib
..
net: tests: use ipwrapper functions in nettestlib
No reason to repeat the code there.
Change-Id: I3b27fc3a39ac289edeffb3f658070944933b2b4c
Signed-off-by: Ido Barkan
---
M tests/nettestlib.py
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/44694/1
diff --git a/tests/nettestlib.py b/tests/nettestlib.py
index 2a56927..82ebc73 100644
--- a/tests/nettestlib.py
+++ b/tests/nettestlib.py
@@ -29,6 +29,7 @@
from nose.plugins.skip import SkipTest
from vdsm.constants import EXT_BRCTL, EXT_TC
+from vdsm.ipwrapper import linkSet, linkAdd, linkDel
from vdsm.netlink import monitor
from vdsm.utils import execCmd, random_iface_name
@@ -56,11 +57,11 @@
self.devName = random_iface_name(prefix)
def _up(self):
-check_call([EXT_IP, "link", "set", self.devName, "up"])
+linkSet(self.devName, ['up'])
def _down(self):
with monitor.Monitor(groups=('link',), timeout=2) as mon:
-check_call([EXT_IP, "link", "set", self.devName, "down"])
+linkSet(self.devName, ['down'])
for event in mon:
if (event.get('name') == self.devName and
event.get('state') == 'down'):
@@ -73,16 +74,15 @@
class Bridge(Interface):
def addDevice(self):
-check_call([EXT_IP, 'link', 'add', 'dev', self.devName, 'type',
-'bridge'])
+linkAdd(self.devName, 'bridge')
self._up()
def delDevice(self):
self._down()
-check_call([EXT_IP, 'link', 'del', self.devName])
+linkDel(self.devName)
def addIf(self, dev):
-check_call([EXT_IP, 'link', 'set', 'dev', dev, 'master', self.devName])
+linkSet(dev, ['master', self.devName])
def _listenOnDevice(fd, icmp):
--
To view, visit https://gerrit.ovirt.org/44694
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b27fc3a39ac289edeffb3f658070944933b2b4c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: tests: rename Interface methods.
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: rename Interface methods.
..
net: tests: rename Interface methods.
Now they correspond better to the iproute2 commands that they call
Change-Id: I8c667c11d709f9f888554bb4800dabb61097828a
Signed-off-by: Ido Barkan
---
M tests/nettestlib.py
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/44693/1
diff --git a/tests/nettestlib.py b/tests/nettestlib.py
index 5540207..2a56927 100644
--- a/tests/nettestlib.py
+++ b/tests/nettestlib.py
@@ -55,10 +55,10 @@
def __init__(self, prefix='vdsm-'):
self.devName = random_iface_name(prefix)
-def _ifUp(self):
+def _up(self):
check_call([EXT_IP, "link", "set", self.devName, "up"])
-def _ifDown(self):
+def _down(self):
with monitor.Monitor(groups=('link',), timeout=2) as mon:
check_call([EXT_IP, "link", "set", self.devName, "down"])
for event in mon:
@@ -75,10 +75,10 @@
def addDevice(self):
check_call([EXT_IP, 'link', 'add', 'dev', self.devName, 'type',
'bridge'])
-self._ifUp()
+self._up()
def delDevice(self):
-self._ifDown()
+self._down()
check_call([EXT_IP, 'link', 'del', self.devName])
def addIf(self, dev):
@@ -113,10 +113,10 @@
ifr = struct.pack('16sH', self.devName, self._IFF_TAP |
self._IFF_NO_PI)
fcntl.ioctl(self._cloneDevice, self._TUNSETIFF, ifr)
-self._ifUp()
+self._up()
def delDevice(self):
-self._ifDown()
+self._down()
self._cloneDevice.close()
def startListener(self, icmp):
--
To view, visit https://gerrit.ovirt.org/44693
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c667c11d709f9f888554bb4800dabb61097828a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: tests: mov veth.pair into nettestlib.py
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: mov veth.pair into nettestlib.py
..
net: tests: mov veth.pair into nettestlib.py
veth is also used by test hence belongs in nettestlib
Change-Id: Ic976754b5b8f41de6d8267a8df17bc6706c9e6af
Signed-off-by: Ido Barkan
---
M tests/functional/networkTests.py
D tests/functional/veth.py
M tests/netinfoTests.py
M tests/nettestlib.py
4 files changed, 31 insertions(+), 57 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/44697/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index a45f800..c09d559 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -49,11 +49,10 @@
expandPermutations, permutations)
from testValidation import (brokentest, slowtest, RequireDummyMod,
RequireVethMod, ValidateRunningAsRoot)
-from nettestlib import Dummy, Tap
+from nettestlib import Dummy, Tap, veth_pair
import dhcp
import firewall
-import veth
from utils import SUCCESS, VdsProxy
@@ -419,7 +418,7 @@
<= (ARP_REQUEST_SIZE + DHCP_PACKET_SIZE),
'%s is out of range' % diff)
-with veth.pair() as (left, right):
+with veth_pair() as (left, right):
# disabling IPv6 on Interface for removal of Router Solicitation
sysctl.disable_ipv6(left)
sysctl.disable_ipv6(right)
@@ -1479,7 +1478,7 @@
self.vdsm_net.refreshNetinfo()
return self.vdsm_net.config.networks[net_name].get('blockingdhcp')
-with veth.pair() as (server, client):
+with veth_pair() as (server, client):
addrAdd(server, IP_ADDRESS, IP_CIDR)
linkSet(server, ['up'])
dhcp_async_net = {'nic': client, 'bridged': False,
@@ -2040,7 +2039,7 @@
@cleanupNet
@RequireVethMod
def testSetupNetworksAddDelDhcp(self, bridged, families):
-with veth.pair() as (left, right):
+with veth_pair() as (left, right):
addrAdd(left, IP_ADDRESS, IP_CIDR)
addrAdd(left, IPv6_ADDRESS, IPv6_CIDR, 6)
linkSet(left, ['up'])
@@ -2139,7 +2138,7 @@
ifcfg_bootproto)
self.assertEqual(bridges[NETWORK_NAME]['dhcpv4'], dhcp)
-with veth.pair() as (left, right):
+with veth_pair() as (left, right):
addrAdd(left, IP_ADDRESS, IP_CIDR)
linkSet(left, ['up'])
with dnsmasqDhcp(left):
@@ -2156,7 +2155,7 @@
def testDhclientLeases(self, family, dateFormat):
dhcpv4_ifaces = set()
dhcpv6_ifaces = set()
-with veth.pair() as (server, client):
+with veth_pair() as (server, client):
addrAdd(server, IP_ADDRESS, IP_CIDR)
addrAdd(server, IPv6_ADDRESS, IPv6_CIDR, 6)
linkSet(server, ['up'])
@@ -2423,7 +2422,7 @@
return [open('/proc/%s/cmdline' % pid).read().strip('\0')
.split('\0')[-1] for pid in pids]
-with veth.pair() as (server, client):
+with veth_pair() as (server, client):
addrAdd(server, IP_ADDRESS, IP_CIDR)
linkSet(server, ['up'])
with dnsmasqDhcp(server):
diff --git a/tests/functional/veth.py b/tests/functional/veth.py
deleted file mode 100644
index 8623cb6..000
--- a/tests/functional/veth.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-from contextlib import contextmanager
-
-from nose.plugins.skip import SkipTest
-
-from vdsm.ipwrapper import linkAdd, IPRoute2Error, linkDel
-from vdsm.utils import random_iface_name
-
-
-@contextmanager
-def pair(prefix='veth_', max_length=15):
-"""
-Yield a pair of veth devices. This assumes root privileges (currently
-required by all tests anyway).
-
-Both sides of the pair have a pseudo-random suffix (e.g. veth_m6Lz7uMK9c).
-"""
-left_side = random_iface_name(prefix, max_length)
-right_side = random_iface_name(prefix, max_length)
-try:
-linkAdd(left_side
Change in vdsm[master]: net: tests: new style classes in nettestlib
Ido Barkan has uploaded a new change for review. Change subject: net: tests: new style classes in nettestlib .. net: tests: new style classes in nettestlib Change-Id: I08bfb2f9e015fb98d47eeaff794f47d43d078b12 Signed-off-by: Ido Barkan --- M tests/nettestlib.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/44692/1 diff --git a/tests/nettestlib.py b/tests/nettestlib.py index e9cea4d..5540207 100644 --- a/tests/nettestlib.py +++ b/tests/nettestlib.py @@ -50,7 +50,7 @@ out, err) -class Interface(): +class Interface(object): def __init__(self, prefix='vdsm-'): self.devName = random_iface_name(prefix) -- To view, visit https://gerrit.ovirt.org/44692 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08bfb2f9e015fb98d47eeaff794f47d43d078b12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: tests: convert dummy module into a class
Ido Barkan has uploaded a new change for review.
Change subject: net: tests: convert dummy module into a class
..
net: tests: convert dummy module into a class
This class will be later moved into nettestlib and be unified with
other test device code.
Change-Id: Ie9c671cb0cf4b5e2e67090861e2018c90f0f95f8
Signed-off-by: Ido Barkan
---
M tests/functional/dummy.py
M tests/functional/networkTests.py
M tests/functional/veth.py
M tests/netlinkTests.py
4 files changed, 113 insertions(+), 112 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/44695/1
diff --git a/tests/functional/dummy.py b/tests/functional/dummy.py
index 17db02e..46c7dac 100644
--- a/tests/functional/dummy.py
+++ b/tests/functional/dummy.py
@@ -24,65 +24,68 @@
from vdsm.utils import random_iface_name
-def create(prefix='dummy_', max_length=11):
-"""
-Create a dummy interface with a pseudo-random suffix, e.g. dummy_ilXaYiSn7.
-Limit the name to 11 characters to make room for VLAN IDs.
-This assumes root privileges.
-"""
-dummy_name = random_iface_name(prefix, max_length)
-try:
-linkAdd(dummy_name, linkType='dummy')
-except IPRoute2Error as e:
-raise SkipTest('Failed to create a dummy interface %s: %s' %
- (dummy_name, e))
-else:
-return dummy_name
+class Dummy(object):
+def __init__(self, prefix='dummy_', max_length=11):
+self.devName = random_iface_name(prefix, max_length)
-def remove(dummy_name):
-"""
-Remove the dummy interface. This assumes root privileges.
-"""
+def create(self):
+"""
+Create a dummy interface with a pseudo-random suffix, e.g.
+dummy_ilXaYiSn7.
+Limit the name to 11 characters to make room for VLAN IDs.
+This assumes root privileges.
+"""
+try:
+linkAdd(self.devName, linkType='dummy')
+except IPRoute2Error as e:
+raise SkipTest('Failed to create a dummy interface %s: %s' %
+ (self.devName, e))
+else:
+return self.devName
-try:
-linkDel(dummy_name)
-except IPRoute2Error as e:
-raise SkipTest("Unable to delete the dummy interface %s: %s" %
- (dummy_name, e))
+def remove(self):
+"""
+Remove the dummy interface. This assumes root privileges.
+"""
+
+try:
+linkDel(self.devName)
+except IPRoute2Error as e:
+raise SkipTest("Unable to delete the dummy interface %s: %s" %
+ (self.devName, e))
+
+def setLinkUp(self):
+self._setLinkState('up')
+
+def setLinkDown(self):
+self._setLinkState('down')
+
+def setIP(self, ipaddr, netmask, family=4):
+try:
+addrAdd(self.devName, ipaddr, netmask, family)
+except IPRoute2Error as e:
+message = ('Failed to add the IPv%s address %s/%s to device %s: %s'
+ % (family, ipaddr, netmask, self.devName, e))
+if family == 6:
+message += ("; NetworkManager may have set the sysctl "
+"disable_ipv6 flag on the device, please see e.g. "
+"RH BZ #1102064")
+raise SkipTest(message)
+
+def _setLinkState(self, state):
+try:
+linkSet(self.devName, [state])
+except IPRoute2Error:
+raise SkipTest('Failed to bring %s to state %s' % (
+self.devName, state))
@contextmanager
def device(prefix='dummy_', max_length=11):
-dummy_name = create(prefix, max_length)
+dummy_interface = Dummy(prefix, max_length)
+dummy_name = dummy_interface.create()
try:
yield dummy_name
finally:
-remove(dummy_name)
-
-
-def setIP(dummy_name, ipaddr, netmask, family=4):
-try:
-addrAdd(dummy_name, ipaddr, netmask, family)
-except IPRoute2Error as e:
-message = ('Failed to add the IPv%s address %s/%s to device %s: %s'
- % (family, ipaddr, netmask, dummy_name, e))
-if family == 6:
-message += ('; NetworkManager may have set the sysctl disable_ipv6'
-' flag on the device, please see e.g. RH BZ #1102064')
-raise SkipTest(message)
-
-
-def setLinkUp(dummy_name):
-_setLinkState(dummy_name, 'up')
-
-
-def setLinkDown(dummy_name):
-_setLinkState(dummy_name, 'down')
-
-
-def _setLinkState(dummy_name, state):
-try:
-linkSet(dummy_name, [state])
-except IPRoute2Error:
-raise SkipTest('Failed to bring %s to state %s' % (dummy_name, state))
+dummy_interface.remove()
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index e811955..10b4426 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -30,7 +
Change in vdsm[master]: ssl: runtime config to choose implementation
automat...@ovirt.org has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Jenkins CI 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[master]: ssl: configurable implementation
automat...@ovirt.org has posted comments on this change. Change subject: ssl: configurable implementation .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6501981bbd5276c49731b0d9eba4794286b0f823 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: vm: do not log known missing alias
automat...@ovirt.org has posted comments on this change. Change subject: vm: do not log known missing alias .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44669 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63bc6d8f4b6fed52ee0af12f129007a1044d413b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Vinzenz Feenstra 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[master]: virt: fully convert to response module
automat...@ovirt.org has posted comments on this change. Change subject: virt: fully convert to response module .. Patch Set 10: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40900 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If1bb95b46197ba4d6c8eccaed33fd77c426a084c Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: vm: remove _reportError
automat...@ovirt.org has posted comments on this change. Change subject: vm: remove _reportError .. Patch Set 26: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie23167c0289bdb0326dcfe48903cd1bae905e9b5 Gerrit-PatchSet: 26 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Vinzenz Feenstra 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[master]: vm: remove unused 'output' value in response
automat...@ovirt.org has posted comments on this change. Change subject: vm: remove unused 'output' value in response .. Patch Set 11: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44116 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0721885876fbe15651737aad4f3b903deb5ef4bb Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: v2v: use the response module
automat...@ovirt.org has posted comments on this change. Change subject: v2v: use the response module .. Patch Set 20: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38447 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I678e764a2895e7c34df6852759b1d43baeb687a1 Gerrit-PatchSet: 20 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Shahar Havivi 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[master]: tests: add tests for disk hotplug/hotunplug
automat...@ovirt.org has posted comments on this change. Change subject: tests: add tests for disk hotplug/hotunplug .. Patch Set 15: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/39053 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idd8b467d49c183c81f6a11494d38984246f5b527 Gerrit-PatchSet: 15 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: clientIF: add logs during the recovery
automat...@ovirt.org has posted comments on this change. Change subject: clientIF: add logs during the recovery .. Patch Set 10: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43770 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I31dddf0a2bc760c5ad383ff6bfee9a72adc87c4f Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek 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[master]: vm: do not log known missing alias
Francesco Romani has posted comments on this change. Change subject: vm: do not log known missing alias .. Patch Set 1: Code-Review-1 (1 comment) I shouldn't be sloppy fixing this. https://gerrit.ovirt.org/#/c/44669/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 4478: for devType in self._devices: Line 4479: for dev in self._devices[devType]: Line 4480: if hasattr(dev, 'alias'): Line 4481: aliasToDevice[dev.alias] = dev Line 4482: elif defType in (hwclass.GRAPHICS, ): > Well for now this might be fine, but I rather would see this tuple to be a good points. Will move to a plain comparison and use a constant. Line 4483: # we expect these failures, we don't log to not Line 4484: # confuse the user Line 4485: pass Line 4486: else: -- To view, visit https://gerrit.ovirt.org/44669 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63bc6d8f4b6fed52ee0af12f129007a1044d413b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Vinzenz Feenstra 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[master]: ssl: runtime config to choose implementation
automat...@ovirt.org has posted comments on this change. Change subject: ssl: runtime config to choose implementation .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Jenkins CI 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[master]: ssl: runtime config to choose implementation
Piotr Kliczewski has uploaded a new change for review.
Change subject: ssl: runtime config to choose implementation
..
ssl: runtime config to choose implementation
During build process we can choose to use standard ssl module or both
m2crypto and ssl module. First option is dedicated enable debian support
whereas second options make it possible to choose an implementation by
setting ssl_impl config value to m2c or ssl.
Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15
Signed-off-by: pkliczewski
---
M lib/vdsm/config.py.in
M lib/vdsm/jsonrpcvdscli.py
M lib/vdsm/vdscli.py
M lib/yajsonrpc/stompreactor.py
M vdsm.spec.in
M vdsm/clientIF.py
M vdsm/kaxmlrpclib.py
M vdsm/protocoldetector.py
M vdsm/virt/migration.py
9 files changed, 37 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/44689/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 8f2e519..6f5a719 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -203,6 +203,9 @@
('connection_stats_timeout', '3600',
'Time in seconds defining how frequently we log transport stats'),
+
+('ssl_impl', 'm2c',
+'Specifies which ssl impl should be used. m2c by default'),
]),
# Section: [mom]
diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py
index 8d8aa0a..ae8965a 100644
--- a/lib/vdsm/jsonrpcvdscli.py
+++ b/lib/vdsm/jsonrpcvdscli.py
@@ -30,7 +30,10 @@
from vdsm import response
from .config import config
try:
-from . import m2cutils as sslutils
+if config.get('vars', 'ssl_impl') == 'm2c':
+from . import m2cutils as sslutils
+else:
+from . import sslutils
except ImportError:
from . import sslutils
diff --git a/lib/vdsm/vdscli.py b/lib/vdsm/vdscli.py
index cf083e3..e655c0d 100644
--- a/lib/vdsm/vdscli.py
+++ b/lib/vdsm/vdscli.py
@@ -26,8 +26,12 @@
import re
import sys
from xml.parsers.expat import ExpatError
+from .config import config
try:
-from . import m2cutils as sslutils
+if config.get('vars', 'ssl_impl') == 'm2c':
+from . import m2cutils as sslutils
+else:
+from . import sslutils
except ImportError:
from . import sslutils
diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py
index b1eda30..4cab4aa 100644
--- a/lib/yajsonrpc/stompreactor.py
+++ b/lib/yajsonrpc/stompreactor.py
@@ -27,7 +27,10 @@
from . import stomp
from .betterAsyncore import Dispatcher, Reactor
try:
-from vdsm.m2cutils import SSLSocket
+if config.get('vars', 'ssl_impl') == 'm2c':
+from vdsm.m2cutils import SSLSocket
+else:
+from ssl import SSLSocket
except ImportError:
from ssl import SSLSocket
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 33e89e1..851c0d3 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -42,7 +42,8 @@
%global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
%endif
-# enable m2crypto by default
+# 0 - enabled ssl
+# 1 - enabled both implementations by default
%global with_m2c 1
# Gluster should not be shipped with RHEV
@@ -1071,7 +1072,7 @@
%{python_sitelib}/%{vdsm_name}/schedule.py*
%if %{with_m2c}
%{python_sitelib}/%{vdsm_name}/m2cutils.py*
-%exclude %{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/sslutils.py*
%else
%exclude %{python_sitelib}/%{vdsm_name}/m2cutils.py*
%{python_sitelib}/%{vdsm_name}/sslutils.py*
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 043383a..0020a1c 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -55,7 +55,10 @@
from virt.vmdevices import hwclass
from virt.utils import isVdsmImage
try:
-from vdsm import m2cutils as sslutils
+if config.get('vars', 'ssl_impl') == 'm2c':
+from vdsm import m2cutils as sslutils
+else:
+from vdsm import sslutils
except ImportError:
from vdsm import sslutils
try:
diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py
index b0640e8..d43230f 100644
--- a/vdsm/kaxmlrpclib.py
+++ b/vdsm/kaxmlrpclib.py
@@ -109,9 +109,13 @@
_connection_class = TcpkeepHTTPConnection
###
+from vdsm.config import config
# the same, for ssl
try:
-from vdsm import m2cutils as sslutils
+if config.get('vars', 'ssl_impl') == 'm2c':
+from vdsm import m2cutils as sslutils
+else:
+from vdsm import sslutils
except ImportError:
from vdsm import sslutils
import ssl
diff --git a/vdsm/protocoldetector.py b/vdsm/protocoldetector.py
index dbdc730..d06fb3d 100644
--- a/vdsm/protocoldetector.py
+++ b/vdsm/protocoldetector.py
@@ -23,9 +23,13 @@
import vdsm.infra.filecontrol as filecontrol
+from vdsm.config import config
from vdsm.utils import monotonic_time
try:
-from vdsm.m2cutils import SSLHandshakeDispatcher
+if config.get('vars', 'ssl_impl') == 'm2c':
+from vdsm.m2cutils import SSLHandshakeDispatcher
+else:
+from
Change in vdsm[master]: ssl: configurable implementation
automat...@ovirt.org has posted comments on this change. Change subject: ssl: configurable implementation .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6501981bbd5276c49731b0d9eba4794286b0f823 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: m2c: rename m2c modules
automat...@ovirt.org has posted comments on this change. Change subject: m2c: rename m2c modules .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44493 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fa842cb7a1ac0b2593df6f6fe67eee118a50616 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: sampling: make _getCpuCoresStats a function
automat...@ovirt.org has posted comments on this change. Change subject: sampling: make _getCpuCoresStats a function .. Patch Set 20: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40429 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If602a84096db7aa7d1a6672b84d62287e08b0ac2 Gerrit-PatchSet: 20 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: sampling: move translation code into hoststats.py
automat...@ovirt.org has posted comments on this change. Change subject: sampling: move translation code into hoststats.py .. Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42034 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icce6acbd596d087491678d039282d5d37d761904 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: sampling: make _getInterfaceStats a function
automat...@ovirt.org has posted comments on this change. Change subject: sampling: make _getInterfaceStats a function .. Patch Set 20: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40430 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0b5796f3463585794d2696ce73f8357cb0fd1f78 Gerrit-PatchSet: 20 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI 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[master]: sampling: remove HostStatsThread.get()
automat...@ovirt.org has posted comments on this change. Change subject: sampling: remove HostStatsThread.get() .. Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42036 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I80d919b0adb48a40d41f387543f14be265610405 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: sampling: add 'ncpus' property to HostSample
automat...@ovirt.org has posted comments on this change. Change subject: sampling: add 'ncpus' property to HostSample .. Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42035 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0e7d549b7772e3f38eec2dd9b91bbc6416b549bf Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: sampling: HostStatsThread as periodic operation
automat...@ovirt.org has posted comments on this change. Change subject: sampling: HostStatsThread as periodic operation .. Patch Set 22: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I39c2e6e4bca286a513992b7231f1356e8dd871a1 Gerrit-PatchSet: 22 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: clientif: hoststats: move elapsedTime in clientIF
automat...@ovirt.org has posted comments on this change. Change subject: clientif: hoststats: move elapsedTime in clientIF .. Patch Set 6: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/42033 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I92de260ef3988c9961ccff5a633037849a129a06 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: clientif: hoststats: move elapsedTime in clientIF
Francesco Romani has abandoned this change. Change subject: clientif: hoststats: move elapsedTime in clientIF .. Abandoned adding state to clientIF is bad idea. -- To view, visit https://gerrit.ovirt.org/42033 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I92de260ef3988c9961ccff5a633037849a129a06 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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[master]: hostdev: add udev rules for USB devices
Francesco Romani has posted comments on this change.
Change subject: hostdev: add udev rules for USB devices
..
Patch Set 3:
(2 comments)
https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer
File vdsm/supervdsmServer:
Line 394: @logDecorator
Line 395: def appropriateUSBDevice(self, bus, device):
Line 396: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device)
Line 397:
Line 398: rule = ('SUBSYSTEM=="usb", ATTRS{{busnum}}=="{}", '
why not just use string concatenation and/or triple quoted strings?
Line 399: 'ATTRS{{devnum}}=="{}", '
Line 400: 'OWNER="{}", GROUP="{}"\n').format(
Line 401: bus, device, QEMU_PROCESS_USER,
QEMU_PROCESS_GROUP)
Line 402:
Line 430: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device)
Line 431:
Line 432: try:
Line 433: os.remove(rule_file)
Line 434: except:
this looks suspicious, could you please explain a bit?
Line 435: raise
Line 436: else:
Line 437: self.log.debug("Removing rule %s", rule_file)
Line 438:
--
To view, visit https://gerrit.ovirt.org/44679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Michal Skrivanek
Gerrit-Reviewer: Michal Skrivanek
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[master]: multipath: Fix "COMPELNT"/"Compellent Vol" configuration
Nir Soffer has posted comments on this change. Change subject: multipath: Fix "COMPELNT"/"Compellent Vol" configuration .. Patch Set 6: We cannot verify this and the previous patch. -- To view, visit https://gerrit.ovirt.org/41244 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic3bf5bab082c5063272bf8947a6e2039ce4cf90c Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: Yeela Kaplan 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[master]: supervdsm: move udev functions to udevadm module
automat...@ovirt.org has posted comments on this change. Change subject: supervdsm: move udev functions to udevadm module .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44684 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id9fecbf0e605e0dd6644b005f00ceedffe46d8d0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik 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[master]: hostdev: add udev rules for USB devices
Michal Skrivanek has posted comments on this change. Change subject: hostdev: add udev rules for USB devices .. Patch Set 3: (1 comment) please mention that this is needed due to dynamic_ownership parameter https://gerrit.ovirt.org/#/c/44679/3/vdsm/supervdsmServer File vdsm/supervdsmServer: Line 425: def rmAppropriateUSBDevice(self, bus, device): Line 426: self.releaseAppropriateUSBDevice(bus, device) Line 427: # We need to give udev some time to handle the events in queue before Line 428: # deleting the rule. Line 429: udevadm.settle(3) it exits when things are settled before reaching timeout. Please give a more conservative number to deal with overloaded hosts...something like 15 might be ok Line 430: rule_file = _UDEV_RULE_FILE_NAME_USB % (bus, device) Line 431: Line 432: try: Line 433: os.remove(rule_file) -- To view, visit https://gerrit.ovirt.org/44679 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Michal Skrivanek 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[master]: hostdev: add udev rules for USB devices
automat...@ovirt.org has posted comments on this change. Change subject: hostdev: add udev rules for USB devices .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44679 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek 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[master]: hostdev: add udev rules for USB devices
automat...@ovirt.org has posted comments on this change. Change subject: hostdev: add udev rules for USB devices .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44679 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik 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[master]: hostdev: add udev rules for USB devices
automat...@ovirt.org has posted comments on this change. Change subject: hostdev: add udev rules for USB devices .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44679 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f72f63186187254cd4aded0a2e6c396001ca28b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik 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[master]: hostdev: fix addressing
automat...@ovirt.org has posted comments on this change. Change subject: hostdev: fix addressing .. Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/44177 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I12592dd53f8af25fe8e1312b810e6b6f48411083 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik 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[master]: vm: do not log known missing alias
Vinzenz Feenstra has posted comments on this change. Change subject: vm: do not log known missing alias .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/44669/1/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 4478: for devType in self._devices: Line 4479: for dev in self._devices[devType]: Line 4480: if hasattr(dev, 'alias'): Line 4481: aliasToDevice[dev.alias] = dev Line 4482: elif defType in (hwclass.GRAPHICS, ): Well for now this might be fine, but I rather would see this tuple to be a constant somewhere above or configured somewhere else than inline. Otherwise I would expect a normal comparison instead, if we do not expect more differences right now. Line 4483: # we expect these failures, we don't log to not Line 4484: # confuse the user Line 4485: pass Line 4486: else: -- To view, visit https://gerrit.ovirt.org/44669 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63bc6d8f4b6fed52ee0af12f129007a1044d413b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Michal Skrivanek Gerrit-Reviewer: Vinzenz Feenstra 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[master]: vm: do not log known missing alias
Francesco Romani has posted comments on this change.
Change subject: vm: do not log known missing alias
..
Patch Set 1: Verified+1
works:
Thread-97::DEBUG::2015-08-11
11:19:31,546::vm::714::virt.vm::(_startUnderlyingVm)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::Start
Thread-96::DEBUG::2015-08-11
11:19:31,547::vm::4497::virt.vm::(waitForMigrationDestinationPrepare)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::migration destination: waiting for
VM creation
Thread-97::INFO::2015-08-11 11:19:31,547::vm::1813::virt.vm::(_run)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::VM wrapper has started
Thread-96::DEBUG::2015-08-11
11:19:31,547::vm::4502::virt.vm::(waitForMigrationDestinationPrepare)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::migration destination: waiting 36s
for path preparation
Thread-97::WARNING::2015-08-11
11:19:31,547::vm::495::virt.vm::(devSpecMapFromConf)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::Unknown type found, device:
'{u'device': u'unix', u'alias': u'channel0', u'type': u'channel', u'address':
{u'bus': u'0', u'controller': u'0', u'type': u'virtio-serial', u'port': u'1'}}'
found
Thread-97::WARNING::2015-08-11
11:19:31,547::vm::495::virt.vm::(devSpecMapFromConf)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::Unknown type found, device:
'{u'device': u'unix', u'alias': u'channel1', u'type': u'channel', u'address':
{u'bus': u'0', u'controller': u'0', u'type': u'virtio-serial', u'port': u'2'}}'
found
Thread-97::WARNING::2015-08-11
11:19:31,547::vm::495::virt.vm::(devSpecMapFromConf)
vmId=`cba0fd67-6968-4b82-a8a8-23a95dbb667f`::Unknown type found, device:
'{u'device': u'spicevmc', u'alias': u'channel2', u'type': u'channel',
u'address': {u'bus': u'0', u'controller': u'0', u'type': u'virtio-serial',
u'port': u'3'}}' found
Thread-97::DEBUG::2015-08-11
11:19:31,548::task::595::Storage.TaskManager.Task::(_updateState)
Task=`9fa8b59f-a824-4fb5-ba67-39e541bbec09`::moving from state init -> state
preparing
Thread-97::INFO::2015-08-11 11:19:31,548::logUtils::48::dispatcher::(wrapper)
Run and protect: getVolumeSize(sdUUID=u'e1f383a6-7496-425f-bb47-c9310dbdf821',
spUUID=u'0001-0001-0001-0001-02ae',
imgUUID=u'eb0d6d14-91fe-4e54-8411-b8c6e6062f7c',
volUUID=u'0ce0502d-b6c1-4aa1-89cb-a1171fd4b87c', options=None)
a future patch will also deal with channel devices
--
To view, visit https://gerrit.ovirt.org/44669
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I63bc6d8f4b6fed52ee0af12f129007a1044d413b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani
Gerrit-Reviewer: Francesco Romani
Gerrit-Reviewer: Jenkins CI
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
