Change in vdsm[ovirt-3.6]: v2v: ova should support zip and extracted directory formats
Shahar Havivi has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/48402 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Shahar Havivi 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]: clusterlock: Remove unneeded workaround
Nir Soffer has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Thanks Idan! -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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]: clusterlock: Remove unneeded workaround
Nir Soffer has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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[ovirt-3.6]: v2v: ova should support zip and extracted directory formats
automat...@ovirt.org has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 1: * #1277879::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1277879::OK, public bug * Check Product::#1277879::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::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/48402 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Shahar Havivi 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[ovirt-3.6]: v2v: ova should support zip and extracted directory formats
Shahar Havivi has uploaded a new change for review. Change subject: v2v: ova should support zip and extracted directory formats .. v2v: ova should support zip and extracted directory formats Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Bug-Url: https://bugzilla.redhat.com/1277879 Signed-off-by: Shahar Havivi --- M vdsm/v2v.py 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/48402/1 diff --git a/vdsm/v2v.py b/vdsm/v2v.py index 5daa4f0..63df7e2 100644 --- a/vdsm/v2v.py +++ b/vdsm/v2v.py @@ -31,8 +31,10 @@ import os import re import signal +import tarfile import threading import xml.etree.ElementTree as ET +import zipfile import libvirt @@ -734,6 +736,39 @@ def _read_ovf_from_ova(ova_path): +''' + virt-v2v support ova in tar, zip formats as well as + extracted directory +''' +if os.path.isdir(ova_path): +return _read_ovf_from_ova_dir(ova_path) +elif zipfile.is_zipfile(ova_path): +return _read_ovf_from_zip_ova(ova_path) +elif tarfile.is_tarfile(ova_path): +return _read_ovf_from_tar_ova(ova_path) +raise ClientError('Unknown ova format, supported formats:' + ' tar, zip or a directory') + + +def _read_ovf_from_ova_dir(ova_path): +files = os.listdir(ova_path) +for ova_file in files: +if '.ovf' == os.path.splitext(ova_file)[1].lower(): +with open(os.path.join(ova_path, ova_file), 'r') as ovf_file: +return ovf_file.read() +raise ClientError('OVA directory %s does not contain ovf file' % ova_path) + + +def _read_ovf_from_zip_ova(ova_path): +with open(ova_path, 'rb') as fh: +zf = zipfile.ZipFile(fh) +for name in zf.namelist(): +if '.ovf' == os.path.splitext(name)[1].lower(): +return zf.read(name) +raise ClientError('OVA does not contains file with .ovf suffix') + + +def _read_ovf_from_tar_ova(ova_path): # FIXME: change to tarfile package when support --to-stdout cmd = ['/usr/bin/tar', 'xf', ova_path, '*.ovf', '--to-stdout'] rc, output, error = execCmd(cmd) -- To view, visit https://gerrit.ovirt.org/48402 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Shahar Havivi ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Remove unneeded workaround
Idan Shaby has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Sure: I had an environment of three hosts. I blocked the outgoing packets from one of the hosts (id=3) to the storage server, and watched its status changing from live, to fail, and eventually to dead. To do that, I used manhole: >>> irs.getHostLeaseStatus({'2b95e786-1d9f-4567-8133-3fc350d8cea4':3}) {'status': {'message': 'OK', 'code': 0}, 'domains': {'2b95e786-1d9f-4567-8133-3fc350d8cea4': 'live'}} >>> irs.getHostLeaseStatus({'2b95e786-1d9f-4567-8133-3fc350d8cea4':3}) {'status': {'message': 'OK', 'code': 0}, 'domains': {'2b95e786-1d9f-4567-8133-3fc350d8cea4': 'fail'}} >>> irs.getHostLeaseStatus({'2b95e786-1d9f-4567-8133-3fc350d8cea4':3}) {'status': {'message': 'OK', 'code': 0}, 'domains': {'2b95e786-1d9f-4567-8133-3fc350d8cea4': 'dead'}} To verify that only this host's (id=3) status has changed, I ran the command: >>> sanlock.get_hosts('c8d24dc0-dfa6-4140-a11f-8b943f2dae0d') And watched its status changing (where the others stayed the same): [{'generation': 12, 'host_id': 1, 'flags': 3, 'io_timeout': 10, 'timestamp': 452680}, {'generation': 7, 'host_id': 2, 'flags': 3, 'io_timeout': 10, 'timestamp': 11591}, {'generation': 10, 'host_id': 3, 'flags': 3, 'io_timeout': 10, 'timestamp': 430448}] [{'generation': 12, 'host_id': 1, 'flags': 3, 'io_timeout': 10, 'timestamp': 450199}, {'generation': 7, 'host_id': 2, 'flags': 3, 'io_timeout': 10, 'timestamp': 9101}, {'generation': 9, 'host_id': 3, 'flags': 4, 'io_timeout': 10, 'timestamp': 427850}] -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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[ovirt-3.5]: netinfo: rework reporting of DHCPv4/6 on network devices
Dan Kenigsberg has posted comments on this change. Change subject: netinfo: rework reporting of DHCPv4/6 on network devices .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/48399/1//COMMIT_MSG Commit Message: Line 14: Line 15: This is because reporting is based on dhclient's leases. Line 16: Line 17: Change-Id: Iaffdc836f8f64ecdc0a7e37ef50c228032f99696 Line 18: Bug-Url: https://bugzilla.redhat.com/1184497 https://bugzilla.redhat.com/show_bug.cgi?id=1279824 Line 19: Signed-off-by: Ondřej Svoboda Line 20: Reviewed-on: https://gerrit.ovirt.org/46430 Line 21: Continuous-Integration: Jenkins CI Line 22: Reviewed-by: Ido Barkan -- To view, visit https://gerrit.ovirt.org/48399 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaffdc836f8f64ecdc0a7e37ef50c228032f99696 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan 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]: clusterlock: Remove unneeded workaround
Dan Kenigsberg has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Continuous-Integration+1 unrelated failure 17:26:54 Last metadata expiration check performed 0:00:02 ago on Tue Nov 10 17:26:47 2015. 17:26:54 Error: nothing provides ovirt-vmconsole >= 1.0.0-0 needed by vdsm-4.17.999-118.git71e8041.fc23.noarch. -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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]: Adding functional tests to check-patch
Yaniv Bronhaim has posted comments on this change. Change subject: Adding functional tests to check-patch .. Patch Set 2: Verified-1 we can abandon this try - we continue with https://gerrit.ovirt.org/#/c/48268/ -- To view, visit https://gerrit.ovirt.org/48136 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia9e7ce0b2f0e2f26c8f3bf94d87da06d5eba7402 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Caro Gerrit-Reviewer: Jenkins CI 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[ovirt-3.5]: netinfo: rework reporting of DHCPv4/6 on network devices
Hello Ido Barkan, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/48399 to review the following change. Change subject: netinfo: rework reporting of DHCPv4/6 on network devices .. netinfo: rework reporting of DHCPv4/6 on network devices This is a minimal backport of upstream patches aiming to fix a bug described as: DHCP is still reported for hours after a network got static IP configuration. This is because reporting is based on dhclient's leases. Change-Id: Iaffdc836f8f64ecdc0a7e37ef50c228032f99696 Bug-Url: https://bugzilla.redhat.com/1184497 Signed-off-by: Ondřej Svoboda Reviewed-on: https://gerrit.ovirt.org/46430 Continuous-Integration: Jenkins CI Reviewed-by: Ido Barkan Reviewed-by: Dan Kenigsberg --- M lib/vdsm/netinfo.py 1 file changed, 54 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/48399/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 01f25c7..f0a83d1 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -540,7 +540,15 @@ in sorted(opts.iteritems( -def _getNetInfo(iface, dhcp4, bridged, gateways, ipv6routes, ipaddrs): +def _dhcp_used(iface, ifaces_with_active_leases, net_attrs): +if net_attrs is None: +return iface in ifaces_with_active_leases +else: +return net_attrs.get('bootproto') == 'dhcp' + + +def _getNetInfo(iface, dhcp4, bridged, gateways, ipv6routes, ipaddrs, +net_attrs): '''Returns a dictionary of properties about the network's interface status. Raises a KeyError if the iface does not exist.''' data = {} @@ -557,7 +565,8 @@ ipv4addr, ipv4netmask, ipv4addrs, ipv6addrs = getIpInfo(iface, ipaddrs) data.update({'iface': iface, 'bridged': bridged, 'addr': ipv4addr, 'netmask': ipv4netmask, - 'bootproto4': 'dhcp' if iface in dhcp4 else 'none', + 'bootproto4': 'dhcp' if _dhcp_used( + iface, dhcp4, net_attrs) else 'none', 'gateway': getgateway(gateways, iface), 'ipv4addrs': ipv4addrs, 'ipv6addrs': ipv6addrs, @@ -618,6 +627,41 @@ 'ipv6addrs': ipv6addrs, 'mtu': str(link.mtu), 'netmask': ipv4netmask} + + +def _propose_updates_to_reported_dhcp(network_info, networking): +""" +Report DHCPv4 state of a network's topmost device based on the network's +configuration, to fix bug #1184497 (DHCP still being reported for hours +after a network got static IP configuration, as reporting is based on +dhclient leases). +""" +updated_networking = dict(bondings={}, bridges={}, nics={}, vlans={}) +network_device = network_info['iface'] + +for devices in ('bridges', 'vlans', 'bondings', 'nics'): +dev_info = networking[devices].get(network_device) +if dev_info: +updated_networking[devices][network_device] = { +'bootproto4': network_info['bootproto4'], +'cfg': {'BOOTPROTO': network_info['bootproto4']}, +} +break + +return updated_networking + + +def _update_reported_dhcp(replacement, networking): +""" +For each network device (representing a network), apply updates to reported +DHCP-related fields, as prepared by _propose_updates_to_reported_dhcp. +""" +for device_type, devices in replacement.iteritems(): +for device_name, replacement_device_info in devices.iteritems(): +device_info = networking[device_type][device_name] +device_info['bootproto4'] = replacement_device_info['bootproto4'] +if replacement_device_info['cfg']: +device_info['cfg'].update(replacement_device_info['cfg']) def _parseExpiryTime(expiryTime): @@ -700,6 +744,7 @@ def _libvirtNets2vdsm(nets, gateways=None, ipv6routes=None, ipAddrs=None): +running_config = RunningConfig() dhcp4 = getDhclientIfaces(_DHCLIENT_LEASES_GLOBS) if gateways is None: gateways = getRoutes() @@ -713,24 +758,11 @@ d[net] = _getNetInfo(netAttr.get('iface', net), dhcp4, netAttr['bridged'], gateways, - ipv6routes, ipAddrs) + ipv6routes, ipAddrs, + running_config.networks.get(net, None)) except KeyError: continue # Do not report missing libvirt networks. return d - - -def _cfgBootprotoCompat(netsAndDevices): -"""Set network 'cfg' 'BOOTPROTO' for backwards engine compatibility.""" -for netAttrs in netsAndDevices['networks'].itervalues(): -if netAttrs['bridged'] and 'BOOTPROTO' not in netAttrs['cfg']: -netAttrs['cfg']['B
Change in vdsm[ovirt-3.5]: netinfo: rework reporting of DHCPv4/6 on network devices
automat...@ovirt.org has posted comments on this change. Change subject: netinfo: rework reporting of DHCPv4/6 on network devices .. Patch Set 1: Verified-1 * #1184497::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1184497::OK, public bug * Check Product::#1184497::OK, Correct classification oVirt * Check TM::#1184497::ERROR, wrong target milestone for stable branch, ovirt-3.6.0-rc3 should match ^.*3.5.* * Check merged to previous::WARN, Still missing on branches ovirt-3.6 -- To view, visit https://gerrit.ovirt.org/48399 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaffdc836f8f64ecdc0a7e37ef50c228032f99696 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: 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]: gluster: Fixing connection when server is not one of the bricks
Nir Soffer has posted comments on this change. Change subject: gluster: Fixing connection when server is not one of the bricks .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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: ova should support zip and extracted directory formats
automat...@ovirt.org has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 6: * #1277879::Update tracker: OK * Set MODIFIED::bug 1277879#1277879IGNORE, not oVirt prod but Red Hat Enterprise Virtualization Manager -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Dan Kenigsberg 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: ova should support zip and extracted directory formats
Dan Kenigsberg has submitted this change and it was merged. Change subject: v2v: ova should support zip and extracted directory formats .. v2v: ova should support zip and extracted directory formats Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Bug-Url: https://bugzilla.redhat.com/1277879 Signed-off-by: Shahar Havivi Reviewed-on: https://gerrit.ovirt.org/48129 Tested-by: Shahar Havivi Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani --- M vdsm/v2v.py 1 file changed, 42 insertions(+), 0 deletions(-) Approvals: Shahar Havivi: Verified Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Dan Kenigsberg 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]: tests: FakeLVM add lvPath test
automat...@ovirt.org has posted comments on this change. Change subject: tests: FakeLVM add lvPath test .. Patch Set 9: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/47863 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46be518e68069412199dfb7ee44c7b7a8a207236 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Dan Kenigsberg 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]: tests: FakeLVM add lvPath test
Dan Kenigsberg has submitted this change and it was merged. Change subject: tests: FakeLVM add lvPath test .. tests: FakeLVM add lvPath test Test the lvPath function. Allow FakeLVM to be created without a temporary directory when it's not needed. In that case, lvPath will return values just like real LVM: /dev// . Change-Id: I46be518e68069412199dfb7ee44c7b7a8a207236 Signed-off-by: Adam Litke Reviewed-on: https://gerrit.ovirt.org/47863 Reviewed-by: Nir Soffer Tested-by: Nir Soffer Continuous-Integration: Jenkins CI --- M tests/storagefakelibTests.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Nir Soffer: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/47863 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46be518e68069412199dfb7ee44c7b7a8a207236 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Dan Kenigsberg 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]: gluster: Fixing connection when server is not one of the bricks
Ala Hino has posted comments on this change. Change subject: gluster: Fixing connection when server is not one of the bricks .. Patch Set 8: (1 comment) https://gerrit.ovirt.org/#/c/48308/8//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2015-11-09 17:56:45 +0200 Line 4: Commit: Ala Hino Line 5: CommitDate: 2015-11-10 22:43:31 +0200 Line 6: Line 7: gluster: Set mount path based on gluster volume info > The title is still describing the old change. This should be something like Done Line 8: Line 9: When processing gluster connection info, volfileserver is set as provided by Line 10: the admin and, using volume info, backup-volfile-servers option is set. However, Line 11: there are use cases where gluster server and ovirt are configured differently -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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: Fixing connection when server is not one of the bricks
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Fixing connection when server is not one of the bricks .. Patch Set 9: * #1278880::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1278880::OK, public bug * Check Product::#1278880::OK, Correct classification oVirt * Check TM::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/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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: FakeLVM add lvPath test
Nir Soffer has posted comments on this change. Change subject: tests: FakeLVM add lvPath test .. Patch Set 8: Code-Review+2 Verified+1 Removed unintended whitespace change. -- To view, visit https://gerrit.ovirt.org/47863 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46be518e68069412199dfb7ee44c7b7a8a207236 Gerrit-PatchSet: 8 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]: tests: FakeLVM add lvPath test
automat...@ovirt.org has posted comments on this change. Change subject: tests: FakeLVM add lvPath test .. 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/47863 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46be518e68069412199dfb7ee44c7b7a8a207236 Gerrit-PatchSet: 8 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]: gluster: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 8: -Code-Review (1 comment) One more thing - the title needs update as well. https://gerrit.ovirt.org/#/c/48308/8//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2015-11-09 17:56:45 +0200 Line 4: Commit: Ala Hino Line 5: CommitDate: 2015-11-10 22:43:31 +0200 Line 6: Line 7: gluster: Set mount path based on gluster volume info The title is still describing the old change. This should be something like "fixing connection when server is not one of the bricks" Line 8: Line 9: When processing gluster connection info, volfileserver is set as provided by Line 10: the admin and, using volume info, backup-volfile-servers option is set. However, Line 11: there are use cases where gluster server and ovirt are configured differently -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 8: Code-Review+1 Thanks Ala! Waiting for Sahina review before approving. -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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]: gluster: Set mount path based on gluster volume info
Ala Hino has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 7: (1 comment) https://gerrit.ovirt.org/#/c/48308/7/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 340: self.log.debug("Using bricks: %s", servers) Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warning("gluster server %r is not in bricks %s, possibly" > This should end with space - current this will log this: Done Line 345: "mounting duplicate servers", Line 346: self._volfileserver, servers) Line 347: Line 348: if not servers: -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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: Set mount path based on gluster volume info
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 8: * #1278880::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1278880::OK, public bug * Check Product::#1278880::OK, Correct classification oVirt * Check TM::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/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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]: gluster: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 7: Code-Review-1 (1 comment) Nice, just one space missing. https://gerrit.ovirt.org/#/c/48308/7/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 340: self.log.debug("Using bricks: %s", servers) Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warning("gluster server %r is not in bricks %s, possibly" This should end with space - current this will log this: gluster server %r is not in bricks %s, possiblymounting duplicate servers Line 345: "mounting duplicate servers", Line 346: self._volfileserver, servers) Line 347: Line 348: if not servers: -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino 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: Sahina Bose 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]: networkTests: ensure that the 'primary' bonding option is re...
Dan Kenigsberg has submitted this change and it was merged. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. networkTests: ensure that the 'primary' bonding option is recognized Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Signed-off-by: Ondřej Svoboda Reviewed-on: https://gerrit.ovirt.org/48389 Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg --- M tests/functional/networkTests.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Ondřej Svoboda: Verified Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda 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]: networkTests: ensure that the 'primary' bonding option is re...
Dan Kenigsberg has posted comments on this change. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda 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]: networkTests: ensure that the 'primary' bonding option is re...
automat...@ovirt.org has posted comments on this change. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. Patch Set 2: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda 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]: networkTests: ensure that the 'primary' bonding option is re...
Ondřej Svoboda has posted comments on this change. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. Patch Set 1: Verified+1 As promised. -- To view, visit https://gerrit.ovirt.org/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda 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]: networkTests: ensure that the 'primary' bonding option is re...
automat...@ovirt.org has posted comments on this change. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. 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/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda 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]: networkTests: ensure that the 'primary' bonding option is re...
Ondřej Svoboda has uploaded a new change for review. Change subject: networkTests: ensure that the 'primary' bonding option is recognized .. networkTests: ensure that the 'primary' bonding option is recognized Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Signed-off-by: Ondřej Svoboda --- M tests/functional/networkTests.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/48389/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 3f4053e..7225790 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -493,12 +493,12 @@ status, msg = self.setupNetworks( {NETWORK_NAME: {'bonding': BONDING_NAME, 'bridged': bridged}}, -{BONDING_NAME: {'nics': nics, 'options': 'mode=2 arp_ip_target' -'=' + IP_ADDRESS_IN_NETWORK}}, NOCHK) +{BONDING_NAME: {'nics': nics, 'options': 'mode=1 primary=' + +nics[0]}}, NOCHK) self.assertEqual(status, SUCCESS, msg) self.assertNetworkExists(NETWORK_NAME, bridged) -self.assertBondExists(BONDING_NAME, nics, 'mode=2 arp_ip_target=' + - IP_ADDRESS_IN_NETWORK) +self.assertBondExists(BONDING_NAME, nics, 'mode=1 primary=' + + nics[0]) status, msg = self.setupNetworks( {NETWORK_NAME: {'remove': True}}, -- To view, visit https://gerrit.ovirt.org/48389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f268f79a4099d5c91ee311d2d3028a8e9a912f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: hooks: ovs: set OVS devices UP
automat...@ovirt.org has posted comments on this change. Change subject: hooks: ovs: set OVS devices UP .. 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/48388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia8af77c136a8f27d980f94647f78570b3da1e611 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: 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]: migration added migrateChangeParams verb
Francesco Romani has posted comments on this change. Change subject: migration added migrateChangeParams verb .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/46934 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52219c0e1f7d619dd30441dd4c70bd401f91e56d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tomas Jelinek 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]: migration: Add support for max migration bandwidth setting
Francesco Romani has posted comments on this change. Change subject: migration: Add support for max migration bandwidth setting .. Patch Set 9: Code-Review+2 (1 comment) https://gerrit.ovirt.org/#/c/46846/9//COMMIT_MSG Commit Message: Line 8: Line 9: Enriched the migrate verb by maxBandwidth. Line 10: Line 11: It is an optional argument and the fallback is to Line 12: migration_max_bandwidth no need for newline here, but not worth a new upload for this. Line 13: from config. Line 14: Line 15: Feature-Page: http://www.ovirt.org/Features/Migration_Enhancements Line 16: Change-Id: I9d99e488a9e8bb80b0c3c069628171c666f3bf4b -- To view, visit https://gerrit.ovirt.org/46846 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9d99e488a9e8bb80b0c3c069628171c666f3bf4b Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak Gerrit-Reviewer: Tomas Jelinek 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]: hooks: ovs: set OVS devices UP
automat...@ovirt.org has posted comments on this change. Change subject: hooks: ovs: set OVS devices UP .. 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/48388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia8af77c136a8f27d980f94647f78570b3da1e611 Gerrit-PatchSet: 2 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: 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: ova should support zip and extracted directory formats
Francesco Romani has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 5: Code-Review+2 thanks for the updates! -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi 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[ovirt-3.5]: jsonrpc: executor based thread factory
Francesco Romani has posted comments on this change. Change subject: jsonrpc: executor based thread factory .. Patch Set 2: Code-Review-1 (1 comment) I'm fine with the concept, but I found an unexpected change. Could be intentional, but worth checking. -1 for visibility. https://gerrit.ovirt.org/#/c/48198/2/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 584: else: : try: : self._threadFactory(partial(self._serveRequest, ctx, request)) : except Exception as e: : self.log.exception("could not allocate request thread") : ctx.requestDone( : JsonRpcResponse( : None, : JsonRpcInternalError( : str(e) : ), : request.id : ) : ) this is surprising - unless I'm missing something huge, I don't see this in the 3.6.x counterpart. Is that intentional? -- To view, visit https://gerrit.ovirt.org/48198 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56b307633a8bf7e4aad8f87cc97a4129c9ed0970 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: executor: Fix thread-unsafe call
Francesco Romani has posted comments on this change. Change subject: executor: Fix thread-unsafe call .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/48197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia99d44698bc03bfcbac1a66f151f40220b8b4ef9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Nir Soffer 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[ovirt-3.5]: schedule: Introduce scheduling library
Francesco Romani has posted comments on this change. Change subject: schedule: Introduce scheduling library .. Patch Set 2: Code-Review+2 looks fine. New code, well covered by tests, very little chance to break something :) -- To view, visit https://gerrit.ovirt.org/48195 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3764806d93bd37c3b5924080eb5ae4d29e4f4e0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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[ovirt-3.5]: executor: introduce the executor library
Francesco Romani has posted comments on this change. Change subject: executor: introduce the executor library .. Patch Set 2: Code-Review+2 looks fine. New code, well covered by tests, very little chance to break something :) -- To view, visit https://gerrit.ovirt.org/48196 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic06da1ba57868dc2c7db67a1868ad10087a1cff2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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]: hooks: ovs: set OVS devices UP
automat...@ovirt.org has posted comments on this change. Change subject: hooks: ovs: set OVS devices UP .. 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/48388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia8af77c136a8f27d980f94647f78570b3da1e611 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: 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]: hooks: ovs: set OVS devices UP
Petr Horáček has uploaded a new change for review. Change subject: hooks: ovs: set OVS devices UP .. hooks: ovs: set OVS devices UP Set all attached and created devices explicitly UP. Change-Id: Ia8af77c136a8f27d980f94647f78570b3da1e611 Signed-off-by: Petr Horáček --- M vdsm_hooks/ovs/ovs_before_network_setup.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/48388/1 diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py index 2f4523e..4cd3e35 100755 --- a/vdsm_hooks/ovs/ovs_before_network_setup.py +++ b/vdsm_hooks/ovs/ovs_before_network_setup.py @@ -32,13 +32,14 @@ from libvirt import libvirtError import six +from vdsm.ipwrapper import linkSet from vdsm.netconfpersistence import RunningConfig from hooking import execCmd import hooking from ovs_utils import (is_ovs_network, is_ovs_bond, iter_ovs_nets, suppress, - destroy_ovs_bridge, EXT_IP, EXT_OVS_VSCTL, + destroy_ovs_bridge, EXT_IP, EXT_OVS_VSCTL, BRIDGE_NAME, INIT_CONFIG_FILE) from ovs_setup_ovs import configure_ovs, prepare_ovs from ovs_setup_ip import configure_ip @@ -130,6 +131,21 @@ running_config, save_init_config=False) +def _set_devices_up(nets, bonds): +devices = {BRIDGE_NAME} +for net, attrs in six.iter_items(nets): +if 'vlan' in attrs: +devices.add(net) +if 'nic' in attrs or 'bond' in attrs: +devices.add(attrs.get('nic') or attrs.get('bond')) +for bond, attrs in six.iter_items(bonds): +devices.add(bond) +devices.update(attrs['nics']) +for device in devices: +# NOTE: this could be async? +linkSet(device, ['up']) + + def _configure(nets, bonds, running_config, save_init_config=True): initial_config = deepcopy(running_config) @@ -145,6 +161,7 @@ configure_ovs(commands, running_config) configure_mtu(running_config) configure_ip(nets, initial_config.networks) +_set_devices_up(nets, bonds) log('Saving running configuration: %s %s' % (running_config.networks, running_config.bonds)) -- To view, visit https://gerrit.ovirt.org/48388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8af77c136a8f27d980f94647f78570b3da1e611 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Set mount path based on gluster volume info
Ala Hino has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 6: (2 comments) https://gerrit.ovirt.org/#/c/48308/6//COMMIT_MSG Commit Message: Line 9: There are cases where gluter server and ovirt are configured Line 10: differently regarding ip addresses and domain names. To avoid Line 11: any issues that could happen due to this misconfiguration, we Line 12: have to use info retuned from gluster volume info to set the Line 13: mount path as well as the backup-volfile-servers. > This describes the previous solution, and not the current version of the pa Done Line 14: Line 15: Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Line 16: Bug-Url: https://bugzilla.redhat.com/1278880 https://gerrit.ovirt.org/#/c/48308/6/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r is not in bricks %s, possibly" Line 345: "mounting duplicate servers", self._volfileserver, > Keep arguments in separate line: Done Line 346: servers) Line 347: Line 348: if not servers: Line 349: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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: Set mount path based on gluster volume info
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 7: * #1278880::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1278880::OK, public bug * Check Product::#1278880::OK, Correct classification oVirt * Check TM::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/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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]: Moving cpopen import to compat to allow working with python 3
Nir Soffer has posted comments on this change. Change subject: Moving cpopen import to compat to allow working with python 3 .. Patch Set 1: Code-Review-1 (1 comment) Nice, but we are not ready for this yet. https://gerrit.ovirt.org/#/c/48384/1/lib/vdsm/qemuimg.py File lib/vdsm/qemuimg.py: Line 222: Line 223: cmd = cmdutils.wrap_command(cmd, with_nice=utils.NICENESS.HIGH, Line 224: with_ioclass=utils.IOCLASS.IDLE) Line 225: _log.debug(cmdutils.command_log_line(cmd, cwd=cwd)) Line 226: self._command = Popen(cmd, cwd=cwd, deathSignal=signal.SIGKILL) cpopen.CPopen defaults are different than subprocess.Popen, so this usage is incorrect - you don't get a pipe for stdin, stdout and stderr, and the progress code will fail. We must add stdin=PIPE, stdout=PIPE, stderr=PIPE to all Popen calls to keep the current semantics. We may have other stuff which is not compatible, like close_fds. Also this can be done only after removing CPopen options which are not supported by subprocess.Popen - deathSignal, childUmas and probably other. Line 227: self._stream = utils.CommandStream( Line 228: self._command, self._recvstdout, self._recvstderr) Line 229: Line 230: def _recvstderr(self, buffer): -- To view, visit https://gerrit.ovirt.org/48384 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I181cd2e52706bfe7b24073d0f0eb42fec15ac490 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg 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]: Adding toolTests.py to python3 check modules
automat...@ovirt.org has posted comments on this change. Change subject: Adding toolTests.py to python3 check modules .. 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/48052 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52f11a1a10cae46773d05d0c09da80ad8eb3b772 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer 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]: Moving cpopen import to compat to allow working with python 3
automat...@ovirt.org has posted comments on this change. Change subject: Moving cpopen import to compat to allow working with python 3 .. 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/48384 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I181cd2e52706bfe7b24073d0f0eb42fec15ac490 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: 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]: Adding python3 run for nosetests
automat...@ovirt.org has posted comments on this change. Change subject: Adding python3 run for nosetests .. Patch Set 9: * 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/48051 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I83355cce2af9125e6f017017905056956cd17081 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sandro Bonazzola 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]: Moving cpopen import to compat to allow working with python 3
Yaniv Bronhaim has uploaded a new change for review. Change subject: Moving cpopen import to compat to allow working with python 3 .. Moving cpopen import to compat to allow working with python 3 Once python3-copen will be available we'll be able to use it. Till then this import trick will allow us to work with the python Popen Change-Id: I181cd2e52706bfe7b24073d0f0eb42fec15ac490 Signed-off-by: Yaniv Bronhaim --- M lib/vdsm/compat.py M lib/vdsm/infra/zombiereaper/tests.py M lib/vdsm/qemuimg.py M lib/vdsm/utils.py M vdsm/storage/remoteFileHandler.py 5 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/48384/1 diff --git a/lib/vdsm/compat.py b/lib/vdsm/compat.py index 8ac5201..5c785a9 100644 --- a/lib/vdsm/compat.py +++ b/lib/vdsm/compat.py @@ -38,3 +38,8 @@ # no big deal, fallback to standard libary import json json # yep, this is needed twice. + +try: +from cpopen import CPopen as Popen +except ImportError: +from subprocess import Popen diff --git a/lib/vdsm/infra/zombiereaper/tests.py b/lib/vdsm/infra/zombiereaper/tests.py index 681579f..9392758 100644 --- a/lib/vdsm/infra/zombiereaper/tests.py +++ b/lib/vdsm/infra/zombiereaper/tests.py @@ -22,7 +22,7 @@ import os from .. import zombiereaper -from cpopen import CPopen +from vdsm.compat import Popen from unittest import TestCase @@ -36,7 +36,7 @@ zombiereaper.unregisterSignalHandler() def testProcessDiesAfterBeingTracked(self): -p = CPopen(["sleep", "1"]) +p = Popen(["sleep", "1"]) zombiereaper.autoReapPID(p.pid) # wait for the grim reaper to arrive sleep(4) @@ -45,7 +45,7 @@ self.assertRaises(OSError, os.waitpid, p.pid, os.WNOHANG) def testProcessDiedBeforeBeingTracked(self): -p = CPopen(["sleep", "0"]) +p = Popen(["sleep", "0"]) # wait for the process to die sleep(1) diff --git a/lib/vdsm/qemuimg.py b/lib/vdsm/qemuimg.py index bce9973..49ea43d 100644 --- a/lib/vdsm/qemuimg.py +++ b/lib/vdsm/qemuimg.py @@ -24,7 +24,7 @@ import re import signal -from cpopen import CPopen +from vdsm.compat import Popen from . import utils from . import cmdutils @@ -223,7 +223,7 @@ cmd = cmdutils.wrap_command(cmd, with_nice=utils.NICENESS.HIGH, with_ioclass=utils.IOCLASS.IDLE) _log.debug(cmdutils.command_log_line(cmd, cwd=cwd)) -self._command = CPopen(cmd, cwd=cwd, deathSignal=signal.SIGKILL) +self._command = Popen(cmd, cwd=cwd, deathSignal=signal.SIGKILL) self._stream = utils.CommandStream( self._command, self._recvstdout, self._recvstderr) diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index 9ebef54..0b14e59 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -52,6 +52,7 @@ import string import threading import time +from vdsm.compat import Popen import vdsm.infra.zombiereaper as zombiereaper from cpopen import CPopen @@ -629,7 +630,6 @@ a temporary thread, spawn a sync=False sub-process, and have the thread finish, the new subprocess would die immediately. """ - command = cmdutils.wrap_command(command, with_ioclass=ioclass, ioclassdata=ioclassdata, with_nice=nice, with_setsid=setsid, with_sudo=sudo, diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index e69ae8c..2123777 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -33,7 +33,7 @@ if __name__ != "__main__": # The following modules are not used by the newly spawned child porcess. # Do not import them in the child to save memory. -from cpopen import CPopen +from vdsm.compat import Popen from vdsm import constants else: # We add the parent directory so that imports that import the storage @@ -231,7 +231,7 @@ env.get("PYTHONPATH", ""), constants.P_VDSM) env['PYTHONPATH'] = ":".join(map(os.path.abspath, env['PYTHONPATH'].split(":"))) -self.process = CPopen([constants.EXT_PYTHON, __file__, +self.process = Popen([constants.EXT_PYTHON, __file__, str(hisRead), str(hisWrite)], close_fds=False, env=env) -- To view, visit https://gerrit.ovirt.org/48384 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I181cd2e52706bfe7b24073d0f0eb42fec15ac490 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Remove usage of deathSignal
automat...@ovirt.org has posted comments on this change. Change subject: Remove usage of deathSignal .. 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/48121 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice7fc30ec90adf8055eb35a8c67c07f514030265 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Federico Simoncelli 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]: lib: executor: pack items in a Task tuple
Francesco Romani has abandoned this change. Change subject: lib: executor: pack items in a Task tuple .. Abandoned no longer needed after the new direction took on 48191 -- To view, visit https://gerrit.ovirt.org/48192 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I56dbafd588fc4bde29334e48559255cfcdc0b3ac Gerrit-PatchSet: 5 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]: lib: executor: pack items in a Task tuple
automat...@ovirt.org has posted comments on this change. Change subject: lib: executor: pack items in a Task tuple .. Patch Set 5: * #1250839::Update tracker: OK -- To view, visit https://gerrit.ovirt.org/48192 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56dbafd588fc4bde29334e48559255cfcdc0b3ac Gerrit-PatchSet: 5 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]: gluster: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 6: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/48308/6//COMMIT_MSG Commit Message: Line 9: There are cases where gluter server and ovirt are configured Line 10: differently regarding ip addresses and domain names. To avoid Line 11: any issues that could happen due to this misconfiguration, we Line 12: have to use info retuned from gluster volume info to set the Line 13: mount path as well as the backup-volfile-servers. This describes the previous solution, and not the current version of the patch. Please update the commit message to reflect what this patch does, and why. Line 14: Line 15: Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Line 16: Bug-Url: https://bugzilla.redhat.com/1278880 https://gerrit.ovirt.org/#/c/48308/6/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r is not in bricks %s, possibly" Line 345: "mounting duplicate servers", self._volfileserver, Keep arguments in separate line: log.warning("message line" "more lines..", arg, arg) And use log.warning - warn works but we try to be consistent: $ git grep 'log\.warning(' | wc -l 121 $ git grep 'log\.warn(' | wc -l 88 Line 346: servers) Line 347: Line 348: if not servers: Line 349: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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: Set mount path based on gluster volume info
Ala Hino has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 5: (2 comments) https://gerrit.ovirt.org/#/c/48308/5/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 336: raise se.UnsupportedGlusterVolumeReplicaCountError(replicaCount) Line 337: Line 338: def _get_backup_servers_option(self): Line 339: servers = [brick.split(":")[0] for brick in self.volinfo['bricks']] Line 340: self.log.info("backup servers returned from volinfo are %s", servers) > This log is falsy, these are not the backup server, but the bricks. Also, k Done Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r not in bricks, possibly mounting" Line 340: self.log.info("backup servers returned from volinfo are %s", servers) Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r not in bricks, possibly mounting" > I would like to see the list of bricks in this log message. When I see a wa Done Line 345: "duplicate servers", self._volfileserver) Line 346: Line 347: if not servers: Line 348: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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: Set mount path based on gluster volume info
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 6: * #1278880::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1278880::OK, public bug * Check Product::#1278880::OK, Correct classification oVirt * Check TM::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/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: automation: fix missing dep ethtool
Sandro Bonazzola has posted comments on this change. Change subject: automation: fix missing dep ethtool .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/48379 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ce20c33d4336a3c27197a49817b7c6771ea7015 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Sandro Bonazzola Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: David Caro Gerrit-Reviewer: Sagi Shnaidman Gerrit-Reviewer: Sandro Bonazzola 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[ovirt-3.5]: automation: fix missing dep ethtool
automat...@ovirt.org has posted comments on this change. Change subject: automation: fix missing dep ethtool .. Patch Set 1: Verified-1 * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::ERROR, At least one bug-url is required for the stable branch * Check merged to previous::WARN, Still missing on branches master, ovirt-3.6 -- To view, visit https://gerrit.ovirt.org/48379 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ce20c33d4336a3c27197a49817b7c6771ea7015 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Sandro Bonazzola Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: automation: fix missing dep ethtool
Sandro Bonazzola has uploaded a new change for review. Change subject: automation: fix missing dep ethtool .. automation: fix missing dep ethtool Fix http://jenkins.ovirt.org/job/vdsm_3.5_build-artifacts-el6-x86_64/1/console by adding missing dep on ethtool. Change-Id: I7ce20c33d4336a3c27197a49817b7c6771ea7015 Signed-off-by: Sandro Bonazzola --- M automation/build-artifacts.packages 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/48379/1 diff --git a/automation/build-artifacts.packages b/automation/build-artifacts.packages index 5adda85..9bf9a16 100644 --- a/automation/build-artifacts.packages +++ b/automation/build-artifacts.packages @@ -10,6 +10,7 @@ pyflakes python-blivet python-devel +python-ethtool python-inotify python-ioprocess python-netaddr -- To view, visit https://gerrit.ovirt.org/48379 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ce20c33d4336a3c27197a49817b7c6771ea7015 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Sandro Bonazzola ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: tests: support iperf3 for performance tests
Petr Horáček has posted comments on this change. Change subject: net: tests: support iperf3 for performance tests .. Patch Set 23: Code-Review-1 (3 comments) https://gerrit.ovirt.org/#/c/46448/23/lib/vdsm/ipwrapper.py File lib/vdsm/ipwrapper.py: Line 596: Line 597: Line 598: def netns_exec(netns_name, command, sync=False): Line 599: netns_command = [_IP_BINARY.cmd, 'netns', 'exec', netns_name] Line 600: if not sync: we prefer positive conditions Line 601: return execCmd(netns_command + command, sync=sync) Line 602: else: Line 603: _execCmd(netns_command + command) Line 604: https://gerrit.ovirt.org/#/c/46448/23/tests/nettestlib.py File tests/nettestlib.py: Line 237: raise SkipTest(message) Line 238: Line 239: Line 240: class IperfServer(object): Line 241: """starts iperf as an async process""" 'Starts ... process.' Line 242: Line 243: def __init__(self, host, network_ns=None): Line 244: """host: the IP address for the server to listen on. Line 245: network_ns: an optional network namespace for the server to run in. Line 249: self._pid = None Line 250: Line 251: def start(self): Line 252: cmd = [_IPERF3_BINARY.cmd, '--server', '--bind', self._bind_to] Line 253: if self._net_ns is not None: positive condition first (or at least less negative) Line 254: p = netns_exec(self._net_ns, cmd) Line 255: else: Line 256: p = execCmd(cmd, sync=False) Line 257: self._pid = p.pid -- To view, visit https://gerrit.ovirt.org/46448 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I15657f8844d131c5444dd680b8de7aa1c4ec2638 Gerrit-PatchSet: 23 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček 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]: Added fc23 repos to the automation scripts
Sandro Bonazzola has posted comments on this change. Change subject: Added fc23 repos to the automation scripts .. Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/48180/3/automation/build-artifacts.repos.fc23 File automation/build-artifacts.repos.fc23: Line 1: # TODO: change once there are fc23 repos available > fc23 repos are now available Done Line 2: ovirt-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/fc22 -- To view, visit https://gerrit.ovirt.org/48180 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie64c291a55c8e5790effac48ae33c12b822a1259 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Caro Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola 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]: Added fc23 repos to the automation scripts
Sandro Bonazzola has posted comments on this change. Change subject: Added fc23 repos to the automation scripts .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/48180 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie64c291a55c8e5790effac48ae33c12b822a1259 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Caro Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola 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]: Added fc23 repos to the automation scripts
automat...@ovirt.org has posted comments on this change. Change subject: Added fc23 repos to the automation scripts .. 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/48180 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie64c291a55c8e5790effac48ae33c12b822a1259 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: David Caro Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola 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]: Adding to vdsm automation lago env setup for functional tests
automat...@ovirt.org has posted comments on this change. Change subject: Adding to vdsm automation lago env setup for functional tests .. Patch Set 12: * 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/48268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I463c754bd70679449d0841caeef1b845b5709f1c Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: David Caro Gerrit-Reviewer: Jenkins CI 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]: gluster: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 5: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/48308/5/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 336: raise se.UnsupportedGlusterVolumeReplicaCountError(replicaCount) Line 337: Line 338: def _get_backup_servers_option(self): Line 339: servers = [brick.split(":")[0] for brick in self.volinfo['bricks']] Line 340: self.log.info("backup servers returned from volinfo are %s", servers) This log is falsy, these are not the backup server, but the bricks. Also, keep log messages much shorter. This could be nice if we use debug level, something like this: self.log.debug("Using bricks: %s", servers) Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r not in bricks, possibly mounting" Line 340: self.log.info("backup servers returned from volinfo are %s", servers) Line 341: if self._volfileserver in servers: Line 342: servers.remove(self._volfileserver) Line 343: else: Line 344: self.log.warn("gluster server %r not in bricks, possibly mounting" I would like to see the list of bricks in this log message. When I see a warning in the log, I want to see all the relevant information in the warning, instead of hunting for it in the log. The message about the bricks returned from gluster is a debug level message. This message should not be in the log in normal condition (we should use info level by default). So when I log a warning, the warning must include all the info I have. Line 345: "duplicate servers", self._volfileserver) Line 346: Line 347: if not servers: Line 348: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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]: jsonrpcvdscli: improve functional network tests duration time
Piotr Kliczewski has posted comments on this change. Change subject: jsonrpcvdscli: improve functional network tests duration time .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/48356/1/tests/functional/networkTests.py File tests/functional/networkTests.py: Line 205: class NetworkTest(TestCaseBase): Line 206: Line 207: @classmethod Line 208: def setUpClass(cls): Line 209: cls._patch_arch.apply() > calling TestCaseBase.setUpClass() seems cleaner. Done Line 210: cls.vdsm_net = VdsProxy() Line 211: Line 212: def cleanupNet(func): Line 213: """ -- To view, visit https://gerrit.ovirt.org/48356 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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]: clusterlock: Remove unneeded workaround
Allon Mureinik has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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]: gluster: Set mount path based on gluster volume info
Ala Hino has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/48308/4/tests/storageServerTests.py File tests/storageServerTests.py: Line 150: Line 151: """ Line 152: This test simulates a use case where gluster server provided in the path Line 153: doesn't appear in the volume info. Line 154: """ > Docstring should come under the function, bot before it. Done Line 155: @MonkeyPatch(storageServer, 'supervdsm', FakeSupervdsm()) Line 156: def test_server_not_in_volinfo(self): Line 157: def glusterVolumeInfo(volname=None, volfileServer=None): Line 158: return {'music': {'brickCount': '3', https://gerrit.ovirt.org/#/c/48308/4/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 339: servers = [brick.split(":")[0] for brick in self.volinfo['bricks']] Line 340: if self._volfileserver in servers: Line 341: servers.remove(self._volfileserver) Line 342: else: Line 343: self.log.warn("gluster server %s not in bricks, possibly mounting \ > This does not work, should be: Not sure I completely understand the comment. I changed the warning msg and added an info msg to log the servers returned from volinfo cmd. Line 344:duplicate servers", self._volfileserver) Line 345: Line 346: if not servers: Line 347: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: jsonrpc: executor based thread factory
Piotr Kliczewski has posted comments on this change. Change subject: jsonrpc: executor based thread factory .. Patch Set 2: Verified+1 Verified by performance team. -- To view, visit https://gerrit.ovirt.org/48198 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56b307633a8bf7e4aad8f87cc97a4129c9ed0970 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski 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]: gluster: Set mount path based on gluster volume info
automat...@ovirt.org has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 5: * #1278880::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1278880::OK, public bug * Check Product::#1278880::OK, Correct classification oVirt * Check TM::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/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: jsonrpc: executor based thread factory
automat...@ovirt.org has posted comments on this change. Change subject: jsonrpc: executor based thread factory .. Patch Set 2: * #1279950::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1279950::OK, public bug * Check Product::#1279950::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1279950::OK, correct target milestone ovirt-3.5.7 * Check merged to previous::WARN, Still open on branches ovirt-3.6 -- To view, visit https://gerrit.ovirt.org/48198 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I56b307633a8bf7e4aad8f87cc97a4129c9ed0970 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: 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[ovirt-3.5]: jsonrpc: executor based thread factory
Piotr Kliczewski has uploaded a new change for review. Change subject: jsonrpc: executor based thread factory .. jsonrpc: executor based thread factory Creating new thread for every request is not efficient so we introduce usage of the executor for request processing. Change-Id: I56b307633a8bf7e4aad8f87cc97a4129c9ed0970 Signed-off-by: pkliczewski --- M lib/vdsm/config.py.in M lib/yajsonrpc/__init__.py M tests/jsonRpcHelper.py M tests/jsonRpcTests.py M vdsm/clientIF.py M vdsm/rpc/BindingJsonRpc.py 6 files changed, 76 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/48198/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index 49a210b..e25e0bc 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -249,6 +249,17 @@ ]), +# Section: [rpc] +('rpc', [ + +('worker_threads', '8', +'Number of worker threads to serve jsonrpc server.'), + +('tasks_per_worker', '10', +'Max number of tasks which can be queued per workers.'), + +]), + # Section: [mom] ('mom', [ diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py index 53b4e2f..9ccce62 100644 --- a/lib/yajsonrpc/__init__.py +++ b/lib/yajsonrpc/__init__.py @@ -582,7 +582,19 @@ if self._threadFactory is None: self._serveRequest(ctx, request) else: -self._threadFactory(partial(self._serveRequest, ctx, request)) +try: +self._threadFactory(partial(self._serveRequest, ctx, request)) +except Exception as e: +self.log.exception("could not allocate request thread") +ctx.requestDone( +JsonRpcResponse( +None, +JsonRpcInternalError( +str(e) +), +request.id +) +) def stop(self): self.log.info("Stopping JsonRPC Server") diff --git a/tests/jsonRpcHelper.py b/tests/jsonRpcHelper.py index 7c4ed40..30905a0 100644 --- a/tests/jsonRpcHelper.py +++ b/tests/jsonRpcHelper.py @@ -34,6 +34,8 @@ from protocoldetector import MultiProtocolAcceptor from yajsonrpc import JsonRpcClientPool from rpc.BindingJsonRpc import BindingJsonRpc +from vdsm import schedule +from vdsm import utils CERT_DIR = os.path.abspath(os.path.dirname(__file__)) @@ -80,7 +82,11 @@ xmlDetector = XmlDetector(xml_binding) acceptor.add_detector(xmlDetector) -json_binding = BindingJsonRpc(jsonBridge) +scheduler = schedule.Scheduler(name="test.Scheduler", + clock=utils.monotonic_time) +scheduler.start() + +json_binding = BindingJsonRpc(jsonBridge, scheduler) json_binding.start() stompDetector = StompDetector(json_binding) acceptor.add_detector(stompDetector) @@ -96,6 +102,7 @@ acceptor.stop() json_binding.stop() xml_binding.stop() +scheduler.stop(wait=False) @contextmanager diff --git a/tests/jsonRpcTests.py b/tests/jsonRpcTests.py index 02c132f..85b3b30 100644 --- a/tests/jsonRpcTests.py +++ b/tests/jsonRpcTests.py @@ -21,6 +21,7 @@ from clientIF import clientIF from contextlib import contextmanager from monkeypatch import MonkeyPatch +from vdsm import executor from testrunner import VdsmTestCase as TestCaseBase, \ expandPermutations, \ @@ -66,6 +67,10 @@ def getInstance(): return FakeClientIf() + + +def dispatch(callable, timeout=None): +raise executor.TooManyTasks @expandPermutations @@ -176,3 +181,20 @@ res = self._callTimeout(client, "ping", [], CALL_ID, timeout=CALL_TIMEOUT) self.assertEquals(res, True) + +@MonkeyPatch(clientIF, 'getInstance', getInstance) +@MonkeyPatch(executor.Executor, 'dispatch', dispatch) +@permutations(PERMUTATIONS) +def testFullExecutor(self, ssl, type): +bridge = _DummyBridge() +with constructClient(self.log, bridge, ssl, type) as clientFactory: +with self._client(clientFactory) as client: +if type == "xml": +# TODO start using executor for xmlrpc +pass +else: +with self.assertRaises(JsonRpcError) as cm: +self._callTimeout(client, "no_method", [], CALL_ID) + +self.assertEquals(cm.exception.code, + JsonRpcInternalError().code) diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index f300ee0..f65dd9d 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -65,7 +65,7 @@ _instance = None _instanceLock = threading.Lock() -def __init__(self, irs, log): +def __init__(self, irs, log, scheduler): """
Change in vdsm[master]: Adding to vdsm automation lago env setup for functional tests
automat...@ovirt.org has posted comments on this change. Change subject: Adding to vdsm automation lago env setup for functional tests .. 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/48268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I463c754bd70679449d0841caeef1b845b5709f1c Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: David Caro Gerrit-Reviewer: Jenkins CI 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[ovirt-3.5]: executor: Fix thread-unsafe call
Hello Dan Kenigsberg, Francesco Romani, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/48197 to review the following change. Change subject: executor: Fix thread-unsafe call .. executor: Fix thread-unsafe call Deques support thread-safe, appends and pops from either side of the deque, but deque.clear() is not documented as thread-safe, so we should not assume it is. Now we take the condition before invoking clear, and the comment about thread-safety was fixed to match Python documentation. Change-Id: Ia99d44698bc03bfcbac1a66f151f40220b8b4ef9 Signed-off-by: Nir Soffer Reviewed-on: https://gerrit.ovirt.org/43790 Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani Reviewed-by: Dan Kenigsberg Bug-Url: https://bugzilla.redhat.com/1279950 --- M lib/vdsm/executor.py 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/48197/2 diff --git a/lib/vdsm/executor.py b/lib/vdsm/executor.py index fc7880e..f63adec 100644 --- a/lib/vdsm/executor.py +++ b/lib/vdsm/executor.py @@ -220,9 +220,10 @@ def __init__(self, max_tasks): self._max_tasks = max_tasks self._tasks = collections.deque() -# deque is thread safe - we can append and pop from both ends without -# additional locking. We need this condition only for waiting. See: -# https://docs.python.org/2.6/library/queue.html#Queue.Full +# Deque supports thread-safe append and pop from both ends. We need +# this condition for waking up threads waiting on an empty queue and +# protecting other methods which are not documented as thread-safe. +# https://docs.python.org/2/library/collections.html#deque-objects self._cond = threading.Condition(threading.Lock()) def put(self, task): @@ -252,4 +253,5 @@ self._cond.wait() def clear(self): -self._tasks.clear() +with self._cond: +self._tasks.clear() -- To view, visit https://gerrit.ovirt.org/48197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia99d44698bc03bfcbac1a66f151f40220b8b4ef9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: executor: Fix thread-unsafe call
automat...@ovirt.org has posted comments on this change. Change subject: executor: Fix thread-unsafe call .. Patch Set 2: -Verified * #1279950::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1279950::OK, public bug * Check Product::#1279950::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1279950::OK, correct target milestone ovirt-3.5.7 * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/48197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia99d44698bc03bfcbac1a66f151f40220b8b4ef9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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]: clusterlock: Remove unneeded workaround
Nir Soffer has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Code-Review+1 -Verified Idan, can you describe (in details) how you verified this patch? -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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[ovirt-3.5]: executor: Fix thread-unsafe call
Piotr Kliczewski has posted comments on this change. Change subject: executor: Fix thread-unsafe call .. Patch Set 2: Verified+1 Verified by performance team -- To view, visit https://gerrit.ovirt.org/48197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia99d44698bc03bfcbac1a66f151f40220b8b4ef9 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Nir Soffer 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[ovirt-3.5]: schedule: Introduce scheduling library
Hello Dan Kenigsberg, Francesco Romani, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/48195 to review the following change. Change subject: schedule: Introduce scheduling library .. schedule: Introduce scheduling library This moudule provides a Scheduler class scheduling execution of callables on a background thread. This should be part of the new scalable vm sampling implemntation. See the module docstring and tests for usage examples. Change-Id: Ie3764806d93bd37c3b5924080eb5ae4d29e4f4e0 Signed-off-by: Nir Soffer Reviewed-on: http://gerrit.ovirt.org/29607 Reviewed-by: Dan Kenigsberg Reviewed-by: Francesco Romani Signed-off-by: pkliczewski Bug-Url: https://bugzilla.redhat.com/1279950 --- M debian/vdsm-python.install M lib/vdsm/Makefile.am A lib/vdsm/schedule.py M tests/Makefile.am A tests/scheduleTests.py M vdsm.spec.in 6 files changed, 441 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/48195/2 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 3488c6e..c10381e 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -16,6 +16,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/password.py ./usr/lib/python2.7/dist-packages/vdsm/profile.py ./usr/lib/python2.7/dist-packages/vdsm/qemuimg.py +./usr/lib/python2.7/dist-packages/vdsm/schedule.py ./usr/lib/python2.7/dist-packages/vdsm/sslutils.py ./usr/lib/python2.7/dist-packages/vdsm/taskset.py ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 1922b91..6c8fb0f 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -35,6 +35,7 @@ password.py \ profile.py \ qemuimg.py \ + schedule.py \ SecureXMLRPCServer.py \ sslutils.py \ sysctl.py \ diff --git a/lib/vdsm/schedule.py b/lib/vdsm/schedule.py new file mode 100644 index 000..92fcc83 --- /dev/null +++ b/lib/vdsm/schedule.py @@ -0,0 +1,220 @@ +# +# Copyright 2014 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 +# + +""" +This module provides a Scheduler class scheduling execution of +a callable on a background thread. + +To use a scheduler, create an instance and start it: + +scheduler = schedule.Scheduler() +scheduler.start() + +The scheduler default clock is time.time. This clock is not monotonic, which +may cause scheduled calls to fire too early or too late if the system time is +modified by the administrator or by ntp service. If you care about this and can +live with utils.monotonic_time's lower resolution, you can use it as the clock. + +scheduler = schedule.Scheduler(clock=utils.monotonic_time) + +When you want to schedule some callable: + +def task(): +print '30 seconds passed' + +scheduler.schedule(30.0, task) + +Task will be called after 30.0 seconds on the scheduler background thread. + +If you need to cancel a scheduled call, keep the ScheduledCall object returned +from Scheduler.schedule(), and cancel the task: + +scheduled_call = scheduler.schedule(30.0, call) +... +scheduled_call.cancel() + +Finally, when the scheduler is not needed any more: + +scheduler.stop() + +This will cancel any pending calls and terminate the scheduler thread. +""" + +import heapq +import logging +import threading +import time + +from . import utils + + +class Scheduler(object): +""" +Schedule calls for future execution in a background thread. + +This class is thread safe; multiple threads can schedule calls or cancel +the scheduler. +""" + +DEFAULT_DELAY = 30.0 # Used if no call are scheduled + +_log = logging.getLogger("Scheduler") + +def __init__(self, name="Scheduler", clock=time.time): +""" +Initialize a scheduler. + +Arguments: + name Used as sheculer thread name + clock Callable returning current time (defualt time.time) +""" +self._name = name +self._clock = clock +self._cond = threading.Condition(threading.Lock()) +self._running = False +self._calls = [] +self._thr
Change in vdsm[ovirt-3.5]: schedule: Introduce scheduling library
automat...@ovirt.org has posted comments on this change. Change subject: schedule: Introduce scheduling library .. Patch Set 2: -Verified * #1279950::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1279950::OK, public bug * Check Product::#1279950::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1279950::OK, correct target milestone ovirt-3.5.7 * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/48195 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3764806d93bd37c3b5924080eb5ae4d29e4f4e0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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]: clusterlock: Remove unneeded workaround
Idan Shaby has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Federico Simoncelli Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan 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]: clusterlock: Remove unneeded workaround
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Remove unneeded workaround .. Patch Set 4: * #1131192::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1131192::OK, public bug * Check Product::#1131192::OK, Correct classification oVirt * Check TM::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/31162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ide75e749fbc2916540c2b526b78fedc247b5c6f9 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer Gerrit-Reviewer: Adam Litke Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Federico Simoncelli 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[ovirt-3.5]: executor: introduce the executor library
Piotr Kliczewski has posted comments on this change. Change subject: executor: introduce the executor library .. Patch Set 2: Verified+1 Verified by performance team. -- To view, visit https://gerrit.ovirt.org/48196 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic06da1ba57868dc2c7db67a1868ad10087a1cff2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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[ovirt-3.5]: schedule: Introduce scheduling library
Piotr Kliczewski has posted comments on this change. Change subject: schedule: Introduce scheduling library .. Patch Set 2: Verified+1 Verified be performance team. -- To view, visit https://gerrit.ovirt.org/48195 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3764806d93bd37c3b5924080eb5ae4d29e4f4e0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani 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[ovirt-3.5]: executor: introduce the executor library
automat...@ovirt.org has posted comments on this change. Change subject: executor: introduce the executor library .. Patch Set 2: -Verified * #1279950::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1279950::OK, public bug * Check Product::#1279950::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::#1279950::OK, correct target milestone ovirt-3.5.7 * Check merged to previous::OK, change not open on any previous branch -- To view, visit https://gerrit.ovirt.org/48196 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic06da1ba57868dc2c7db67a1868ad10087a1cff2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: executor: introduce the executor library
Hello Dan Kenigsberg, Francesco Romani, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/48196 to review the following change. Change subject: executor: introduce the executor library .. executor: introduce the executor library Executor is a thread pool augmented with the capability of discard blocked worker threads, by replacing them with fresh ones. This is needed to accomodate the needs of the sampling code. The sampling needs to deal with possibly blocking libvirt calls which needs to enter into the QEMU monitor, thus can get stuck due to QEMU being in D state. Change-Id: Ic06da1ba57868dc2c7db67a1868ad10087a1cff2 Signed-off-by: Francesco Romani Reviewed-on: http://gerrit.ovirt.org/29191 Reviewed-by: Nir Soffer Reviewed-by: Dan Kenigsberg Signed-off-by: pkliczewski Bug-Url: https://bugzilla.redhat.com/1279950 --- M debian/vdsm-python.install M lib/vdsm/Makefile.am A lib/vdsm/executor.py M tests/Makefile.am A tests/executorTests.py M vdsm.spec.in 6 files changed, 404 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/48196/2 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index c10381e..956f618 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -8,6 +8,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/constants.py ./usr/lib/python2.7/dist-packages/vdsm/define.py ./usr/lib/python2.7/dist-packages/vdsm/exception.py +./usr/lib/python2.7/dist-packages/vdsm/executor.py ./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py ./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py ./usr/lib/python2.7/dist-packages/vdsm/netconfpersistence.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 6c8fb0f..ba3a2c8 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -27,6 +27,7 @@ compat.py \ define.py \ exception.py \ + executor.py \ ipwrapper.py \ libvirtconnection.py \ netconfpersistence.py \ diff --git a/lib/vdsm/executor.py b/lib/vdsm/executor.py new file mode 100644 index 000..fc7880e --- /dev/null +++ b/lib/vdsm/executor.py @@ -0,0 +1,255 @@ +# +# Copyright 2014 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 +# + +"""Threaded based executor. +Blocked tasks may be discarded, and the worker pool is automatically +replenished.""" + +import collections +import logging +import threading + +from . import utils + + +class NotRunning(Exception): +"""Executor not yet started or shutting down.""" + + +class AlreadyStarted(Exception): +"""Executor started multiple times.""" + + +class TooManyTasks(Exception): +"""Too many tasks for this Executor.""" + + +class Executor(object): +""" +Executes potentially blocking task into background +threads. Can replace stuck threads with fresh ones. +""" + +_log = logging.getLogger('Executor') + +def __init__(self, name, workers_count, max_tasks, scheduler): +self._name = name +self._workers_count = workers_count +self._tasks = _TaskQueue(max_tasks) +self._scheduler = scheduler +self._workers = set() +self._lock = threading.Lock() +self._running = False + +@property +def name(self): +return self._name + +def start(self): +self._log.debug('Starting executor') +with self._lock: +if self._running: +raise AlreadyStarted() +self._running = True +for _ in xrange(self._workers_count): +self._add_worker() + +def stop(self, wait=True): +self._log.debug('Stopping executor') +with self._lock: +self._running = False +self._tasks.clear() +for _ in xrange(self._workers_count): +self._tasks.put((_STOP, None)) +workers = tuple(self._workers) if wait else () +for worker in workers: +worker.join() + +def dispatch(self, callable, timeout=None): +""" +dispatches a new task to the executor. + +The task may be any callable. +The task will be executed as soon
Change in vdsm[master]: asyncore: remove misleading log entry
automat...@ovirt.org has posted comments on this change. Change subject: asyncore: remove misleading log entry .. 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/48375 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib35eb35c7ffe52b090c329136041bc21694fbdaf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: 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]: asyncore: remove misleading log entry
Piotr Kliczewski has uploaded a new change for review. Change subject: asyncore: remove misleading log entry .. asyncore: remove misleading log entry From time to time I can see misleading warning in the logs: betterAsyncore::144::vds.dispatcher::(log_info) unhandled close event In order to get rid of it we make sure that we handle close event for all the dispatchers that we have and we call close on dispatcher. Change-Id: Ib35eb35c7ffe52b090c329136041bc21694fbdaf Signed-off-by: pkliczewski --- M lib/vdsm/sslutils.py M vdsm/protocoldetector.py 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/48375/1 diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py index 443ae8c..3b52a81 100644 --- a/lib/vdsm/sslutils.py +++ b/lib/vdsm/sslutils.py @@ -297,6 +297,9 @@ self.want_read = self.want_write = True self._is_handshaking = False +def handle_close(self, dispatcher): +dispatcher.close() + def create_ssl_context(): sslctx = None diff --git a/vdsm/protocoldetector.py b/vdsm/protocoldetector.py index 0bcc7a6..af7818d 100644 --- a/vdsm/protocoldetector.py +++ b/vdsm/protocoldetector.py @@ -72,6 +72,9 @@ *client.getpeername()) self._dispatcher_factory(client) +def handle_close(self, dispatcher): +dispatcher.close() + class _ProtocolDetector(object): log = logging.getLogger("ProtocolDetector.Detector") @@ -128,6 +131,9 @@ def has_expired(self): return monotonic_time() >= self._give_up_at +def handle_close(self, dispatcher): +dispatcher.close() + class MultiProtocolAcceptor: """ -- To view, visit https://gerrit.ovirt.org/48375 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib35eb35c7ffe52b090c329136041bc21694fbdaf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: jsonrpcvdscli: improve functional network tests duration time
Dan Kenigsberg has posted comments on this change. Change subject: jsonrpcvdscli: improve functional network tests duration time .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/48356/1/tests/functional/networkTests.py File tests/functional/networkTests.py: Line 205: class NetworkTest(TestCaseBase): Line 206: Line 207: @classmethod Line 208: def setUpClass(cls): Line 209: cls._patch_arch.apply() calling TestCaseBase.setUpClass() seems cleaner. Line 210: cls.vdsm_net = VdsProxy() Line 211: Line 212: def cleanupNet(func): Line 213: """ -- To view, visit https://gerrit.ovirt.org/48356 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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]: jsonrpcvdscli: improve functional network tests duration time
Piotr Kliczewski has posted comments on this change. Change subject: jsonrpcvdscli: improve functional network tests duration time .. Patch Set 1: Verified-1 After testing both invocation it seems that there is still place for improvement. -- To view, visit https://gerrit.ovirt.org/48356 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček 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]: net: tests: test network's iface
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: test network's iface .. 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/48366 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If45fb63247b5e5b21721a23d8781a4ed80e58932 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Ido Barkan Gerrit-Reviewer: Ondřej Svoboda 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: test if network's iface
automat...@ovirt.org has posted comments on this change. Change subject: net: tests: test if network's iface .. 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/48366 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If45fb63247b5e5b21721a23d8781a4ed80e58932 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: 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: test if network's iface
Petr Horáček has uploaded a new change for review. Change subject: net: tests: test if network's iface .. net: tests: test if network's iface Change-Id: If45fb63247b5e5b21721a23d8781a4ed80e58932 Signed-off-by: Petr Horáček --- M tests/functional/networkTests.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/48366/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 3f4053e..76c2fa6 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -245,6 +245,16 @@ if bridged is not None: self.assertEqual(config.networks[networkName].get('bridged'), bridged) +network = netinfo.networks[networkName] +if network['bridged']: +self.assertEquals(network['iface'], networkName) +elif network['vlan']: +vlan_name = '%s.%s' % (network['bond'] or network['nic'], + network['vlan']) +self.assertEquals(network['iface'], vlan_name) +else: +self.assertEquals(network['iface'], + network['bond'] or network['nic']) def assertNetworkDoesntExist(self, networkName): netinfo = self.vdsm_net.netinfo -- To view, visit https://gerrit.ovirt.org/48366 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If45fb63247b5e5b21721a23d8781a4ed80e58932 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: ifup ignores invalid gateway settings
automat...@ovirt.org has posted comments on this change. Change subject: net: ifup ignores invalid gateway settings .. Patch Set 1: * #1270688::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1270688::OK, public bug * Check Product::#1270688::OK, Correct classification oVirt * Check TM::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/48365 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I90d63be7bf004011752013ea9bf35fe9ee23093d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg 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: ifup ignores invalid gateway settings
Petr Horáček has uploaded a new change for review. Change subject: net: ifup ignores invalid gateway settings .. net: ifup ignores invalid gateway settings When we try to set address and gateway on different subnets, ifup just writes a warning to error output and returns 0. This should fail. Change-Id: I90d63be7bf004011752013ea9bf35fe9ee23093d Signed-off-by: Petr Horáček Bug-Url: https://bugzilla.redhat.com/1270688 --- M vdsm/network/configurators/ifcfg.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/48365/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index c2b0345..2e87c6d 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -56,6 +56,8 @@ NET_LOGICALNET_CONF_BACK_DIR = netinfo.NET_CONF_BACK_DIR + 'logicalnetworks/' +NETWORK_IS_UNREACHABLE = 'RTNETLINK answers: Network is unreachable' + def is_available(): return True @@ -806,6 +808,10 @@ # In /etc/sysconfig/network-scripts/ifup* the last line usually # contains the error reason. raise ConfigNetworkError(ERR_FAILED_IFUP, out[-1] if out else '') +elif NETWORK_IS_UNREACHABLE in err: +# When address and gateway are on different subnets, ifup just writes +# a warning to error output and returns 0 (BZ#1270688). +raise ConfigNetworkError(ERR_FAILED_IFUP, NETWORK_IS_UNREACHABLE) def _ifup(iface, cgroup=dhclient.DHCLIENT_CGROUP): -- To view, visit https://gerrit.ovirt.org/48365 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90d63be7bf004011752013ea9bf35fe9ee23093d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: gluster: Set mount path based on gluster volume info
Nir Soffer has posted comments on this change. Change subject: gluster: Set mount path based on gluster volume info .. Patch Set 4: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/48308/4/tests/storageServerTests.py File tests/storageServerTests.py: Line 150: Line 151: """ Line 152: This test simulates a use case where gluster server provided in the path Line 153: doesn't appear in the volume info. Line 154: """ Docstring should come under the function, bot before it. def func_name(): """ docstring here... """ Line 155: @MonkeyPatch(storageServer, 'supervdsm', FakeSupervdsm()) Line 156: def test_server_not_in_volinfo(self): Line 157: def glusterVolumeInfo(volname=None, volfileServer=None): Line 158: return {'music': {'brickCount': '3', https://gerrit.ovirt.org/#/c/48308/4/vdsm/storage/storageServer.py File vdsm/storage/storageServer.py: Line 339: servers = [brick.split(":")[0] for brick in self.volinfo['bricks']] Line 340: if self._volfileserver in servers: Line 341: servers.remove(self._volfileserver) Line 342: else: Line 343: self.log.warn("gluster server %s not in bricks, possibly mounting \ This does not work, should be: self.log.warning("first line..." "...continuation line") Also, including the servers in the log would make it easier to debug later. We can go and find the mount command later in the log, but why make it harder for us? Finally use %r for the server name, will reveal issues with leading and trailing whitespace. (e.g. server is " foo", " foo" in ["foo", "bar"] -> False) Line 344:duplicate servers", self._volfileserver) Line 345: Line 346: if not servers: Line 347: return "" -- To view, visit https://gerrit.ovirt.org/48308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3386b37cd407c52e1b8f38d54c236bffc143e2f Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Sahina Bose 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: ova should support zip and extracted directory formats
Shahar Havivi has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi 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: ova should support zip and extracted directory formats
automat...@ovirt.org has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 5: * #1277879::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1277879::OK, public bug * Check Product::#1277879::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TM::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/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi 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]: jsonrpcvdscli: improve functional network tests duration time
automat...@ovirt.org has posted comments on this change. Change subject: jsonrpcvdscli: improve functional network tests duration time .. 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/48356 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: 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]: jsonrpcvdscli: improve functional network tests duration time
Piotr Kliczewski has uploaded a new change for review. Change subject: jsonrpcvdscli: improve functional network tests duration time .. jsonrpcvdscli: improve functional network tests duration time The tests were creating new jsonrpcvdscli#_Server every time before test invocation. In __init__ method we perform schema parsing which is time consuming operation. We improved duration time of the test by creating the objects only once instead of before every test method. Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Signed-off-by: pkliczewski --- M tests/functional/networkTests.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/48356/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 3f4053e..a00e042 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -204,8 +204,10 @@ @expandPermutations class NetworkTest(TestCaseBase): -def setUp(self): -self.vdsm_net = VdsProxy() +@classmethod +def setUpClass(cls): +cls._patch_arch.apply() +cls.vdsm_net = VdsProxy() def cleanupNet(func): """ -- To view, visit https://gerrit.ovirt.org/48356 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1fd202566edd389f06d49876e5b83391686b53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: v2v: ova should support zip and extracted directory formats
Shahar Havivi has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/48129/4/vdsm/v2v.py File vdsm/v2v.py: Line 769: def _read_ovf_from_zip_ova(ova_path): Line 770: with open(ova_path, 'rb') as fh: Line 771: zf = zipfile.ZipFile(fh) Line 772: name = _find_ovf(zf.namelist()) Line 773: if name is not None and '.ovf' == os.path.splitext(name)[1].lower(): > ok, but the right side of the 'and' looks redundant: don't we do this very you right... Line 774: return zf.read(name) Line 775: raise ClientError('OVA does not contains file with .ovf suffix') Line 776: Line 777: -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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]: v2v: ova should support zip and extracted directory formats
Francesco Romani has posted comments on this change. Change subject: v2v: ova should support zip and extracted directory formats .. Patch Set 4: Code-Review-1 (1 comment) one question inside, -1 for visibility. https://gerrit.ovirt.org/#/c/48129/4/vdsm/v2v.py File vdsm/v2v.py: Line 769: def _read_ovf_from_zip_ova(ova_path): Line 770: with open(ova_path, 'rb') as fh: Line 771: zf = zipfile.ZipFile(fh) Line 772: name = _find_ovf(zf.namelist()) Line 773: if name is not None and '.ovf' == os.path.splitext(name)[1].lower(): ok, but the right side of the 'and' looks redundant: don't we do this very check in _find_ovf? Line 774: return zf.read(name) Line 775: raise ClientError('OVA does not contains file with .ovf suffix') Line 776: Line 777: -- To view, visit https://gerrit.ovirt.org/48129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I494b88709c4c23fd39690b589eff1134e74f81ba Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI 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