vdsm-patches October 2016

vdsm-patches@lists.fedorahosted.org

33 participants
468 discussions

Change in vdsm[master]: osinfo: un-nest kernel version gathering function
by Martin Polednik 13 Oct '16

13 Oct '16

Martin Polednik has uploaded a new change for review. Change subject: osinfo: un-nest kernel version gathering function ...................................................................... osinfo: un-nest kernel version gathering function Previous function, kernelDict, had unclear naming and was needlessly nested within package_versions function. This patch un-nests the function and renames it to _runtime_kernel_version. The new name hints why we don't look up the version via rpmdb. Change-Id: I77f78882973855cc971bbdae66cc96c8068e8230 Signed-off-by: Martin Polednik <mpolednik(a)redhat.com> --- M lib/vdsm/osinfo.py 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/65379/1 diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index d443028..23bb2c2 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -178,17 +178,7 @@ def package_versions(): - def kernelDict(): - ret = os.uname() - try: - ver, rel = ret[2].split('-', 1) - except ValueError: - logging.error('kernel release not found', exc_info=True) - ver, rel = '0', '0' - - return dict(version=ver, release=rel) - - pkgs = {'kernel': kernelDict()} + pkgs = {'kernel': _runtime_kernel_version()} if _release_name() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL, OSName.POWERKVM): @@ -251,3 +241,14 @@ logging.error('', exc_info=True) return pkgs + + +def _runtime_kernel_version(): + ret = os.uname() + try: + ver, rel = ret[2].split('-', 1) + except ValueError: + logging.error('kernel release not found', exc_info=True) + ver, rel = '0', '0' + + return dict(version=ver, release=rel) -- To view, visit https://gerrit.ovirt.org/65379 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77f78882973855cc971bbdae66cc96c8068e8230 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>

4 7

Change in vdsm[master]: osinfo: remove kernel compile time
by Martin Polednik 13 Oct '16

13 Oct '16

Martin Polednik has uploaded a new change for review. Change subject: osinfo: remove kernel compile time ...................................................................... osinfo: remove kernel compile time The field is not user within newer engines and shouldn't be depended upon as the code itself is not safe for all kernels. Change-Id: Iacc9b0fe5446abd5405db6efff6b7f9f16468bc9 Signed-off-by: Martin Polednik <mpolednik(a)redhat.com> --- M lib/vdsm/osinfo.py 1 file changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/65059/1 diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py index 3c6ab3b..1e6cdaa 100644 --- a/lib/vdsm/osinfo.py +++ b/lib/vdsm/osinfo.py @@ -23,7 +23,6 @@ import glob import linecache import logging -import time import os from vdsm import utils @@ -186,14 +185,8 @@ except ValueError: logging.error('kernel release not found', exc_info=True) ver, rel = '0', '0' - try: - t = ret[3].split()[2:] - del t[4] # Delete timezone - t = time.mktime(time.strptime(' '.join(t))) - except ValueError: - logging.error('kernel build time not found', exc_info=True) - t = '0' - return dict(version=ver, release=rel, buildtime=t) + + return dict(version=ver, release=rel) pkgs = {'kernel': kernelDict()} -- To view, visit https://gerrit.ovirt.org/65059 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacc9b0fe5446abd5405db6efff6b7f9f16468bc9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>

6 25

Change in vdsm[master]: py3: make gluster_cli_tests pass
by Dan Kenigsberg 13 Oct '16

13 Oct '16

Dan Kenigsberg has uploaded a new change for review. Change subject: py3: make gluster_cli_tests pass ...................................................................... py3: make gluster_cli_tests pass Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/kaxmlrpclib.py M lib/vdsm/network/netlink/addr.py M tests/gluster_cli_tests.py M vdsm/gluster/storagedev.py 4 files changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/65008/1 diff --git a/lib/vdsm/kaxmlrpclib.py b/lib/vdsm/kaxmlrpclib.py index e24316c..66ec9e0 100644 --- a/lib/vdsm/kaxmlrpclib.py +++ b/lib/vdsm/kaxmlrpclib.py @@ -33,8 +33,8 @@ from __future__ import absolute_import from __future__ import print_function -import xmlrpclib -import httplib +import six.moves.xmlrpc_client +import six.moves.http_client import socket # It would have been nicer to make these server-specific and not module-wide @@ -48,19 +48,19 @@ def Server(url, *args, **kwargs): kwargs['transport'] = TcpkeepTransport() - server = xmlrpclib.Server(url, *args, **kwargs) + server = six.moves.xmlrpc_client.Server(url, *args, **kwargs) return server ServerProxy = Server -class TcpkeepTransport(xmlrpclib.Transport): +class TcpkeepTransport(six.moves.xmlrpc_client.Transport): def make_connection(self, host): return TcpkeepHTTPConnection(host) -class TcpkeepHTTPConnection(httplib.HTTPConnection): +class TcpkeepHTTPConnection(six.moves.http_client.HTTPConnection): def connect(self): """Connect to the host and port specified in __init__. @@ -110,7 +110,7 @@ def SslServer(url, ctx, *args, **kwargs): kwargs['transport'] = TcpkeepSafeTransport(ctx) - server = xmlrpclib.Server(url, *args, **kwargs) + server = six.moves.xmlrpc_client.Server(url, *args, **kwargs) return server SslServerProxy = SslServer diff --git a/lib/vdsm/network/netlink/addr.py b/lib/vdsm/network/netlink/addr.py index 0037454..cb17bf3 100644 --- a/lib/vdsm/network/netlink/addr.py +++ b/lib/vdsm/network/netlink/addr.py @@ -79,7 +79,7 @@ """Returns the textual representation of the address flags""" flags = (c_char * (CHARBUFFSIZE * 2))() return frozenset(_rtnl_addr_flags2str(_rtnl_addr_get_flags(addr), flags, - sizeof(flags)).split(',')) + sizeof(flags)).split(b',')) # C function prototypes diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py index 4ab9daf..0493c27 100644 --- a/tests/gluster_cli_tests.py +++ b/tests/gluster_cli_tests.py @@ -18,6 +18,8 @@ # Refer to the README and COPYING files for full details of the license # +import six + from testlib import VdsmTestCase as TestCaseBase from gluster import cli as gcli import xml.etree.cElementTree as etree @@ -446,7 +448,7 @@ """ tree = etree.fromstring(out) status = gcli._parseVolumeStatusClients(tree) - self.assertEquals(status.keys(), ['bricks', 'name']) + self.assertEquals(set(six.iterkeys(status)), {'bricks', 'name'}) self.assertEquals(status['name'], 'music') oBricks = [{'brick': '192.168.122.2:/tmp/music-b1', 'hostuuid': diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index a7ab985..a0eefaa 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -35,7 +35,7 @@ from vdsm import utils from vdsm.gluster import exception as ge -import fstab +from . import fstab from . import gluster_mgmt_api -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 15

Change in vdsm[master]: tests: Add tests for poll and wait failures
by automation＠ovirt.org 13 Oct '16

13 Oct '16

gerrit-hooks has posted comments on this change. Change subject: tests: Add tests for poll and wait failures ...................................................................... Patch Set 9: * Update Tracker::IGNORE, not relevant for branch: master * Check Bug-Url::IGNORE, not relevant for branch: master * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65294 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8674c9c3c2118041c74213cd8ce0d383086d6cbf Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: tests: Add test for terminating a terminated process
by Nir Soffer 13 Oct '16

13 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: tests: Add test for terminating a terminated process ...................................................................... tests: Add test for terminating a terminated process In this case we should find that the process has terminated and waited, and do not invoke kill(). Change-Id: Ic0f06c28857664cc49beb938f33ac3c9d07ca3b6 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/utilsTests.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/65328/1 diff --git a/tests/utilsTests.py b/tests/utilsTests.py index 27a84e7..8c7ae61 100644 --- a/tests/utilsTests.py +++ b/tests/utilsTests.py @@ -111,6 +111,18 @@ pass self.assertEqual(self.proc.returncode, -signal.SIGTERM) + def test_process_terminated(self): + self.proc.terminate() + self.proc.wait() + + def fail(): + raise RuntimeError("Attempt to kill a terminated process") + + self.proc.kill = fail + with utils.terminating(self.proc): + pass + self.assertEqual(self.proc.returncode, -signal.SIGTERM) + def test_kill_failure(self): class FakeKillError(Exception): pass -- To view, visit https://gerrit.ovirt.org/65328 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0f06c28857664cc49beb938f33ac3c9d07ca3b6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 12

Change in vdsm[master]: tests: Add tests for poll and wait failures
by Nir Soffer 13 Oct '16

13 Oct '16

Nir Soffer has posted comments on this change. Change subject: tests: Add tests for poll and wait failures ...................................................................... Patch Set 8: (2 comments) https://gerrit.ovirt.org/#/c/65294/8/tests/utilsTests.py File tests/utilsTests.py: Line 132: self.check_failure() Line 133: Line 134: def test_kill_failure(self): Line 135: def fail(): Line 136: raise ExpectedFailure("Fake kill failure") > Now we have it 3 times. 3 test, 3 fail texts, please suggest a simple and more clear code. Line 137: Line 138: self.proc.kill = fail Line 139: self.check_failure() Line 140: Line 154: self.assertEqual(type(e.exception.error), ExpectedFailure) Line 155: Line 156: # Note: We cannot check return code since AsyncProc.returncode is a Line 157: # property calling poll(). The return code here may be None or -9, Line 158: # depeending on timing. > Wouldn't be better to wait to be sure that timing is correct instead of rem There is no way to test this with AsyncProc, check how it imlements returncode. Line 159: Line 160: Line 161: class ExpectedFailure(Exception): Line 162: pass -- To view, visit https://gerrit.ovirt.org/65294 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8674c9c3c2118041c74213cd8ce0d383086d6cbf Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: tests: Add tests for poll and wait failures
by Piotr Kliczewski 13 Oct '16

13 Oct '16

Piotr Kliczewski has posted comments on this change. Change subject: tests: Add tests for poll and wait failures ...................................................................... Patch Set 8: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/65294/8/tests/utilsTests.py File tests/utilsTests.py: PS8, Line 135: def fail(): : raise ExpectedFailure("Fake kill failure") Now we have it 3 times. PS8, Line 158: timing Wouldn't be better to wait to be sure that timing is correct instead of removing it? -- To view, visit https://gerrit.ovirt.org/65294 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8674c9c3c2118041c74213cd8ce0d383086d6cbf Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: pep8: Fix long line in sos plugin
by Nir Soffer 13 Oct '16

13 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: pep8: Fix long line in sos plugin ...................................................................... pep8: Fix long line in sos plugin Change-Id: I81c2f558f7e34505b9873a8b379f88339859f589 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/sos/vdsm.py.in 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/65402/1 diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index e47cd8a..cead70d 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -129,7 +129,8 @@ self.collectExtOutput("/usr/sbin/nodectl info") with closing(jsonrpcvdscli.connect()) as cli: - self.addObjectAsFile(cli.getVdsCapabilities(), "getVdsCapabilities") + self.addObjectAsFile( + cli.getVdsCapabilities(), "getVdsCapabilities") self.addObjectAsFile(cli.getVdsStats(), "getVdsStats") self.addObjectAsFile(cli.getAllVmStats(), "getAllVmStats") self.addObjectAsFile(cli.list(), "list") -- To view, visit https://gerrit.ovirt.org/65402 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81c2f558f7e34505b9873a8b379f88339859f589 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 7

Change in vdsm[master]: hsm:Use sd compat instead of qemu conf compat.
by automation＠ovirt.org 13 Oct '16

13 Oct '16

gerrit-hooks has posted comments on this change. Change subject: hsm:Use sd compat instead of qemu conf compat. ...................................................................... Patch Set 10: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/64951 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie4b19a99e5d9a73c011bf6d8079e3855298561b9 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Amit Aviram <aaviram(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: tests: Add tests for poll and wait failures
by automation＠ovirt.org 13 Oct '16

13 Oct '16

gerrit-hooks has posted comments on this change. Change subject: tests: Add tests for poll and wait failures ...................................................................... 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65294 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8674c9c3c2118041c74213cd8ce0d383086d6cbf Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2016