vdsm-patches November 2014

vdsm-patches@lists.fedorahosted.org

49 participants
639 discussions

Change in vdsm[master]: domain_descriptor: Eliminate magic hash init value
by Nir Soffer 08 Nov '14

08 Nov '14

Nir Soffer has uploaded a new change for review. Change subject: domain_descriptor: Eliminate magic hash init value ...................................................................... domain_descriptor: Eliminate magic hash init value We used to initialize devices hash to 0 when there are no devices. There is no need for using this magic value. Hashing an empty string does not require additional comments and is more general. The magic "0" hash value was exposed in the past in the stats xml, and could be used for detecting a fresh domain without any devices, but this value is not exposed any more since we introduced the guest agent disk mapping hash. Change-Id: I36767eafbef3dbebef5a1d04417f18e0cc4898c2 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/virt/domain_descriptor.py 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/34622/1 diff --git a/vdsm/virt/domain_descriptor.py b/vdsm/virt/domain_descriptor.py index baca905..3e567ab 100644 --- a/vdsm/virt/domain_descriptor.py +++ b/vdsm/virt/domain_descriptor.py @@ -26,9 +26,8 @@ self._xml = xmlStr self._dom = xml.dom.minidom.parseString(xmlStr) self._devices = self._firstElementByTagName('devices') - # VDSM by default reports '0' as hash when it has no device list yet - self._devicesHash = (hash(self._devices.toxml()) if self._devices - else 0) + self._devicesHash = hash(self._devices.toxml() + if self._devices else '') @classmethod def fromId(cls, uuid): -- To view, visit http://gerrit.ovirt.org/34622 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36767eafbef3dbebef5a1d04417f18e0cc4898c2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 7

Change in vdsm[master]: Revised the format of output from the vdsm-tool vdsm-id comm...
by Alon Bar-Lev 08 Nov '14

08 Nov '14

Alon Bar-Lev has posted comments on this change. Change subject: Revised the format of output from the vdsm-tool vdsm-id command. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/34583 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7379e969881931aaa4745dedf85ddfb61487f4a4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrew Dahms <andrewjdahms(a)gmail.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: Revised the format of output from the vdsm-tool vdsm-id comm...
by ybronhei＠redhat.com 08 Nov '14

08 Nov '14

Yaniv Bronhaim has posted comments on this change. Change subject: Revised the format of output from the vdsm-tool vdsm-id command. ...................................................................... Patch Set 1: please get alonbl ack. ovirt-host-deploy reads it and im not sure how \n can effect the way it uses it. I guess its fine, but let him double check that. and please verify. just add new host by engine -- To view, visit http://gerrit.ovirt.org/34583 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7379e969881931aaa4745dedf85ddfb61487f4a4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrew Dahms <andrewjdahms(a)gmail.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: tool: bugfix function called as attribute.
by mtayer＠redhat.com 07 Nov '14

07 Nov '14

mooli tayer has uploaded a new change for review. Change subject: tool: bugfix function called as attribute. ...................................................................... tool: bugfix function called as attribute. to fix bug, instead of using selinux.is_selinux_enabled I suggest using the recently added utils.get_selinux_enforce_mode(). In both cases the code means to check if selinux != disabled (permissive | enforcing). Change-Id: Id7c52e6f409b808c79653e40255cf62743b1fd0c Signed-off-by: Mooli Tayer <mtayer(a)redhat.com> --- M lib/vdsm/tool/configurators/configfile.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/34487/1 diff --git a/lib/vdsm/tool/configurators/configfile.py b/lib/vdsm/tool/configurators/configfile.py index 9ec6b5b..13ed563 100644 --- a/lib/vdsm/tool/configurators/configfile.py +++ b/lib/vdsm/tool/configurators/configfile.py @@ -187,7 +187,7 @@ if self._oldmod != os.stat(self._filename).st_mode: os.chmod(self._filename, self._oldmod) - if selinux.is_selinux_enabled: + if utils.get_selinux_enforce_mode() > -1: try: selinux.restorecon(self._filename) except OSError: -- To view, visit http://gerrit.ovirt.org/34487 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7c52e6f409b808c79653e40255cf62743b1fd0c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>

4 9

Change in vdsm[master]: storageServer: remove dead code from getSessionInfo
by derez＠redhat.com 07 Nov '14

07 Nov '14

Daniel Erez has uploaded a new change for review. Change subject: storageServer: remove dead code from getSessionInfo ...................................................................... storageServer: remove dead code from getSessionInfo storageServer -> getSessionInfo: cleanup of unused code ('sessions' varibale is never used). Change-Id: Idd93fd7d0257caea60bb3981ec1a6604e0dcc723 Signed-off-by: Daniel Erez <derez(a)redhat.com> --- M vdsm/storage/storageServer.py 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/34537/1 diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 76c043c..b2390dc 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -17,7 +17,6 @@ # # Refer to the README and COPYING files for full details of the license # -from itertools import chain import errno import logging from os.path import normpath, basename, splitext @@ -400,13 +399,6 @@ return True def getSessionInfo(self): - sessions = iscsi.iterateIscsiSessions() - try: - info = iscsi.getSessionInfo(self._lastSessionId) - sessions = chain(info, sessions) - except Exception: - pass - for session in iscsi.iterateIscsiSessions(): if self.isSession(session): self._lastSessionId = session.id -- To view, visit http://gerrit.ovirt.org/34537 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd93fd7d0257caea60bb3981ec1a6604e0dcc723 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Daniel Erez <derez(a)redhat.com>

5 11

Change in vdsm[master]: oop: vdsm.config is not used anymore
by osvoboda＠redhat.com 07 Nov '14

07 Nov '14

Ondřej Svoboda has uploaded a new change for review. Change subject: oop: vdsm.config is not used anymore ...................................................................... oop: vdsm.config is not used anymore This fixes a pyflakes check: ./tests/outOfProcessTests.py:31: 'config' imported but unused Change-Id: I05aefa707b1b7154d11cdc25a95a8d0ae1cb3fab Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/outOfProcessTests.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/34847/1 diff --git a/tests/outOfProcessTests.py b/tests/outOfProcessTests.py index f06c71d..974e2e1 100644 --- a/tests/outOfProcessTests.py +++ b/tests/outOfProcessTests.py @@ -28,8 +28,6 @@ import re from weakref import ref -from vdsm.config import config - class OopWrapperTests(TestCaseBase): -- To view, visit http://gerrit.ovirt.org/34847 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05aefa707b1b7154d11cdc25a95a8d0ae1cb3fab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

4 4

Change in vdsm[master]: vm: hold config lock while replying status
by fromani＠redhat.com 07 Nov '14

07 Nov '14

Francesco Romani has uploaded a new change for review. Change subject: vm: hold config lock while replying status ...................................................................... vm: hold config lock while replying status confLock must be held in the Vm.status() method while iterating in conf to avoid Thread-97::ERROR::2014-10-13 02:47:58,251::__init__::491::jsonrpc.JsonRpcServer::(_serveRequest) Internal server error Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/yajsonrpc/__init__.py", line 486, in _serveRequest res = method(**params) File "/usr/share/vdsm/rpc/Bridge.py", line 266, in _dynamicMethod result = fn(*methodArgs) File "/usr/share/vdsm/API.py", line 1267, in getAllVmStats vms = self.getVMList() File "/usr/share/vdsm/API.py", line 1360, in getVMList if not vmSet or v.id in vmSet]} File "/usr/share/vdsm/API.py", line 1349, in reportedStatus d = v.status() File "/usr/share/vdsm/virt/vm.py", line 2855, in status return dict((k, v) for k, v in self.conf.iteritems() File "/usr/share/vdsm/virt/vm.py", line 2855, in <genexpr> return dict((k, v) for k, v in self.conf.iteritems() RuntimeError: dictionary changed size during iteration Change-Id: I604f8534c9380d289633df4a8151699ab0d97e34 Relates-To: https://bugzilla.redhat.com/1151953 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/34147/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index ad8cb0e..ef41c6f 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2416,8 +2416,9 @@ # used by API.Global.getVMList self.conf['status'] = self.lastStatus # Filter out any internal keys - status = dict((k, v) for k, v in self.conf.iteritems() - if not k.startswith("_")) + with self._confLock: + status = dict((k, v) for k, v in self.conf.iteritems() + if not k.startswith("_")) status['guestDiskMapping'] = self.guestAgent.guestDiskMapping return status -- To view, visit http://gerrit.ovirt.org/34147 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I604f8534c9380d289633df4a8151699ab0d97e34 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 22

Change in vdsm[master]: tests: make pyflakes happy with outOfProcess tests
by fromani＠redhat.com 07 Nov '14

07 Nov '14

Francesco Romani has uploaded a new change for review. Change subject: tests: make pyflakes happy with outOfProcess tests ...................................................................... tests: make pyflakes happy with outOfProcess tests This patch fixes python -c 'import pyflakes; print("pyflakes-%s" % pyflakes.__version__)' pyflakes-0.8.1 find . -path './.git' -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs /home/fromani/.local/bin/pyflakes | \ grep -w -v "\./vdsm/storage/lvm\.py.*: list comprehension redefines 'lv' from line .*" | \ while read LINE; do echo "$LINE"; false; done ./tests/outOfProcessTests.py:31: 'config' imported but unused Change-Id: I5aa3ea1f1d26ff633a70317c10d456465c39ed74 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/outOfProcessTests.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/34896/1 diff --git a/tests/outOfProcessTests.py b/tests/outOfProcessTests.py index f06c71d..974e2e1 100644 --- a/tests/outOfProcessTests.py +++ b/tests/outOfProcessTests.py @@ -28,8 +28,6 @@ import re from weakref import ref -from vdsm.config import config - class OopWrapperTests(TestCaseBase): -- To view, visit http://gerrit.ovirt.org/34896 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5aa3ea1f1d26ff633a70317c10d456465c39ed74 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 6

Change in vdsm[master]: spec: remove redundant check.
by mtayer＠redhat.com 07 Nov '14

07 Nov '14

mooli tayer has uploaded a new change for review. Change subject: spec: remove redundant check. ...................................................................... spec: remove redundant check. if not fedora 0%{?fedora} evaluates to 0. Change-Id: I50e1706e7f8c9b07b6788fbbabf61b40306801c3 Signed-off-by: Mooli Tayer <mtayer(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/34610/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 68c757a..d7394ad 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -256,7 +256,7 @@ Requires(post): /usr/sbin/saslpasswd2 -%if 0%{?fedora} && 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 Requires(post): hostname %else Requires(post): /bin/hostname -- To view, visit http://gerrit.ovirt.org/34610 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50e1706e7f8c9b07b6788fbbabf61b40306801c3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>

4 8

Change in vdsm[master]: vm: safe(r) Vm.conf update.
by fromani＠redhat.com 07 Nov '14

07 Nov '14

Francesco Romani has uploaded a new change for review. Change subject: vm: safe(r) Vm.conf update. ...................................................................... vm: safe(r) Vm.conf update. Vm.conf is updated in unsafe in quite too many creation flows. The effect is that we can get RuntimeError due to the concurrent access of two threads, like Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/yajsonrpc/__init__.py", line 242, in sendReply encodedObjects.append(response.encode()) File "/usr/lib/python2.6/site-packages/yajsonrpc/__init__.py", line 140, in encode return json.dumps(res, 'utf-8') File "/usr/lib64/python2.6/json/__init__.py", line 237, in dumps **kw).encode(obj) File "/usr/lib64/python2.6/json/encoder.py", line 367, in encode chunks = list(self.iterencode(o)) File "/usr/lib64/python2.6/json/encoder.py", line 309, in _iterencode for chunk in self._iterencode_dict(o, markers): File "/usr/lib64/python2.6/json/encoder.py", line 275, in _iterencode_dict for chunk in self._iterencode(value, markers): File "/usr/lib64/python2.6/json/encoder.py", line 309, in _iterencode for chunk in self._iterencode_dict(o, markers): File "/usr/lib64/python2.6/json/encoder.py", line 275, in _iterencode_dict for chunk in self._iterencode(value, markers): File "/usr/lib64/python2.6/json/encoder.py", line 306, in _iterencode for chunk in self._iterencode_list(o, markers): File "/usr/lib64/python2.6/json/encoder.py", line 204, in _iterencode_list for chunk in self._iterencode(value, markers): File "/usr/lib64/python2.6/json/encoder.py", line 309, in _iterencode for chunk in self._iterencode_dict(o, markers): File "/usr/lib64/python2.6/json/encoder.py", line 247, in _iterencode_dict for key, value in items: RuntimeError: dictionary changed size during iteration One of the most prominent issues is that the Device hierarchy (Vm.conf['devices']) is updated in the Vm.run() method, after the Vm object is registered into vmContainer, thus is queryable. This is performed in an unsafe way, by doing a shallow copy of the device container. This patch fixes this problem by doing a deepcopy in the _run() flow. Doing so, the device conf appears to be atomically updated from the perspective of a client of the Vm class. There are other, more rare, known failures like the one being fixed here, still caused by uncareful update of the Vm.conf data, in this flow on in other creation flows, but they will be addressed by separate patches once pinpointed. Finally, this issue is yet another reminder that an overhaul of the handling of the conf data and of the device tree is long due and really needed, but there is still a long road ahead. Bug-Url: https://bugzilla.redhat.com/1143968 Change-Id: Ie9dee2aa01b2c231b99e02a879dcfbd7ecc7f70a Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/34813/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 9740ab3..c17327a 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1395,7 +1395,10 @@ # For BC we need to save previous behaviour for old type parameters. # The new/old type parameter will be distinguished # by existence/absence of the 'devices' key - if self.conf.get('devices') is None: + with self._confLock: + devConf = deepcopy(self.conf.get('devices')) + + if devConf is None: devices[DISK_DEVICES] = self.getConfDrives() devices[NIC_DEVICES] = self.getConfNetworkInterfaces() devices[SOUND_DEVICES] = self.getConfSound() @@ -1403,7 +1406,7 @@ devices[GRAPHICS_DEVICES] = self.getConfGraphics() devices[CONTROLLER_DEVICES] = self.getConfController() else: - for dev in self.conf.get('devices'): + for dev in devConf: try: devices[dev['type']].append(dev) except KeyError: -- To view, visit http://gerrit.ovirt.org/34813 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9dee2aa01b2c231b99e02a879dcfbd7ecc7f70a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 17

← Newer
1
...
56
57
58
59
60
61
62
63
64
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2014