vdsm-patches October 2016

vdsm-patches@lists.fedorahosted.org

33 participants
468 discussions

Change in vdsm[master]: hook-fcoe is arch depended
by ybronhei＠redhat.com 08 Nov '16

08 Nov '16

Yaniv Bronhaim has uploaded a new change for review. Change subject: hook-fcoe is arch depended ...................................................................... hook-fcoe is arch depended Using %post script in sub-package of arch depended package requires to declare the package as arch depended. Change-Id: Ic59d7e29a75b13e1fc39b58a8d1252d6d2971058 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm.spec.in 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/62454/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index edd8e82..728a534 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -681,7 +681,6 @@ %package hook-fcoe Summary: Hook to enable FCoE support -BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: fcoe-utils -- To view, visit https://gerrit.ovirt.org/62454 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic59d7e29a75b13e1fc39b58a8d1252d6d2971058 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 8

Change in vdsm[master]: Revert "Remove __init__.py file from lib64 vdsm python direc...
by ybronhei＠redhat.com 08 Nov '16

08 Nov '16

Yaniv Bronhaim has uploaded a new change for review. Change subject: Revert "Remove __init__.py file from lib64 vdsm python directory" ...................................................................... Revert "Remove __init__.py file from lib64 vdsm python directory" This reverts commit 9f9e8b37c6fb120f1bb40514c9d22c9d5602dded. Which is not needed anymore (we stop supporting upgrade from vdsm <=17). Without the %post script we can declare vdsm-python as noarch. Change-Id: Id06b502c714074a62c8ac6b5d5cb9d350472137b Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm.spec.in 1 file changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/62453/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index edd8e82..8aaa866 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -347,19 +347,6 @@ %description python Shared libraries between the various VDSM packages. -%post python -# REQUIRED_FOR: Upgrade from 4.14 to 4.17 -# HACK: Remove vdsm python lib __init__ file if installed on old location -# https://bugzilla.redhat.com/show_bug.cgi?id=1279167 -if [ "$1" -ge 2 ]; then - if [ -d "%{python2_sitearch}/%{vdsm_name}" ]; then - logger -t '%{vdsm_name}' \ - 'Disabling old vdsm package in %{python2_sitearch}/%{vdsm_name}.' \ - 'Removing %{python2_sitearch}/%{vdsm_name}/init.py*' - rm -f %{python2_sitearch}/%{vdsm_name}/__init__.py* - fi -fi - %package tests Summary: VDSM Test Suite BuildArch: noarch -- To view, visit https://gerrit.ovirt.org/62453 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id06b502c714074a62c8ac6b5d5cb9d350472137b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 8

Change in vdsm[master]: stomp: broker cleanup
by Piotr Kliczewski 08 Nov '16

08 Nov '16

Piotr Kliczewski has uploaded a new change for review. Change subject: stomp: broker cleanup ...................................................................... stomp: broker cleanup We can remove engine 3.5 supported queue names since we do not support this version anymore. Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> --- M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py 2 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/65681/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 41ac70f..558c519 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -22,11 +22,6 @@ from vdsm import utils import re -# REQUIRED_FOR: engine-3.5 -# safe to remove when 3.5 support is dropped -LEGACY_SUBSCRIPTION_ID_REQUEST = "/queue/_local/vdsm/requests" -LEGACY_SUBSCRIPTION_ID_RESPONSE = "/queue/_local/vdsm/reponses" - _RE_ESCAPE_SEQUENCE = re.compile(r"\\(.)") _RE_ENCODE_CHARS = re.compile(r"[\r\n\\:]") diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py index 233bee3..42d7d01 100644 --- a/lib/yajsonrpc/stompreactor.py +++ b/lib/yajsonrpc/stompreactor.py @@ -200,11 +200,6 @@ frame.headers.get(stomp.Headers.REPLY_TO), frame.body) return - elif stomp.LEGACY_SUBSCRIPTION_ID_REQUEST == destination: - self._handle_internal(dispatcher, - stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE, - frame.body) - return else: try: subs = self._sub_dests[destination] @@ -323,7 +318,7 @@ """ Sends message to all subscribes that subscribed to destination. """ - def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE): + def send(self, message, destination): resp = json.loads(message) response_id = resp.get("id") @@ -414,8 +409,7 @@ self._reactor.wakeup() return sub - def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE, - headers=None): + def send(self, message, destination, headers=None): self.log.debug("Sending response") self._aclient.send( destination, -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

4 9

Change in vdsm[master]: virt: Always execute after_hibernation event
by Vinzenz Feenstra 07 Nov '16

07 Nov '16

Vinzenz Feenstra has uploaded a new change for review. Change subject: virt: Always execute after_hibernation event ...................................................................... virt: Always execute after_hibernation event Previously we had no way that the after_hibernation event got executed. The enableGuestEvents value was never set to true and we're now also dropping it on the migration destination. Since there is also no parameter for enabling guest events on the suspend call it, we decided that it is much more beneficial to let the VM always know that it is going to be hibernated and/or has been resumed from hibernation. Since purely from theory this information can be also determined without the notifications there's no security issue that the Virtual Machine would know too much about it's environment. However it's beneficial for a range of applications which need to resynchronize, adjust the time or re-accquire an IP address via DHCP etc. Change-Id: Ic52b8c22d57028fb6459c7faa2bcfebd8f32d6c4 Bug-Url: https://bugzilla.redhat.com/1349907 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/59914/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index c2b1b93..d8e4239 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1866,14 +1866,19 @@ except Exception: self.log.exception("Failed to connect to guest agent channel") - try: - if self.conf.get('enableGuestEvents', False): - if self.lastStatus == vmstatus.MIGRATION_DESTINATION: + if self.lastStatus == vmstatus.RESTORING_STATE: + try: + self.guestAgent.events.after_hibernation() + except Exception: + self.log.exception("Unexpected error on guest after " + "hibernation notification") + elif self.conf.get('enableGuestEvents', False): + if self.lastStatus == vmstatus.MIGRATION_DESTINATION: + try: self.guestAgent.events.after_migration() - elif self.lastStatus == vmstatus.RESTORING_STATE: - self.guestAgent.events.after_hibernation() - except Exception: - self.log.exception("Unexpected error on guest event notification") + except Exception: + self.log.exception("Unexpected error on guest after " + "migration notification") # Drop enableGuestEvents from conf - Not required from here anymore self.conf.pop('enableGuestEvents', None) -- To view, visit https://gerrit.ovirt.org/59914 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic52b8c22d57028fb6459c7faa2bcfebd8f32d6c4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 5

Change in vdsm[master]: tests: Create all instance variables in setUp
by Nir Soffer 04 Nov '16

04 Nov '16

Nir Soffer has uploaded a new change for review. Change subject: tests: Create all instance variables in setUp ...................................................................... tests: Create all instance variables in setUp AcceptorTests added self.reactor attribute in start_acceptor. This leads later to AttributeError when you try to clean up stuff in tearDown if the test failed before the line adding self.reactor. Adding all instance variable in setUp avoid this issue, and make it easy to understand the state managed by the test class. Change-Id: I0360932b3a7515fe8f87cd0ccc2cc4f6b2c90381 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/protocoldetectorTests.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/65101/1 diff --git a/tests/protocoldetectorTests.py b/tests/protocoldetectorTests.py index c0c1369..887a8c6 100644 --- a/tests/protocoldetectorTests.py +++ b/tests/protocoldetectorTests.py @@ -105,6 +105,7 @@ BUFSIZE = 512 def setUp(self): + self.reactor = None self.acceptor = None self.acceptor_address = None -- To view, visit https://gerrit.ovirt.org/65101 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0360932b3a7515fe8f87cd0ccc2cc4f6b2c90381 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 6

Change in vdsm[master]: numa: Don't crash on hotplugged CPUs when retrieving NUMA info
by mzamazal＠redhat.com 04 Nov '16

04 Nov '16

Milan Zamazal has uploaded a new change for review. Change subject: numa: Don't crash on hotplugged CPUs when retrieving NUMA info ...................................................................... numa: Don't crash on hotplugged CPUs when retrieving NUMA info getVmNumaNodeRuntimeInfo maps virtual (from Engine) nodes to physical nodes by matching nodes and CPUs from the libvirt runtime and from the Engine NUMA mapping. CPUs that are not pinned to any node in the Engine NUMA mapping (such as hotplugged CPUs) are irrelevant. However the matching cycle still looks for them in the Engine NUMA mapping dictionary, resulting in KeyError. This patch fixes the KeyError by simply skipping the CPUs not present in the Engine NUMA mapping. Change-Id: If7d00b897e430d9c4e8a23cb1451209b6f00e688 Signed-off-by: Milan Zamazal <mzamazal(a)redhat.com> --- M lib/vdsm/numa.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/65562/1 diff --git a/lib/vdsm/numa.py b/lib/vdsm/numa.py index 7a31a99..15a8c73 100644 --- a/lib/vdsm/numa.py +++ b/lib/vdsm/numa.py @@ -260,7 +260,10 @@ vcpu_to_vnode = _get_mapping_vcpu_to_vnode(vm) for vcpu_id, pcpu_id in vcpu_to_pcpu.iteritems(): - vnode_index = str(vcpu_to_vnode[vcpu_id]) + try: + vnode_index = str(vcpu_to_vnode[vcpu_id]) + except KeyError: # hotplugged CPU + continue vm_numa_placement[vnode_index].add(pcpu_to_pnode[pcpu_id]) vm_numa_placement[vnode_index].update( vcpu_to_pnode.get(vcpu_id, ())) -- To view, visit https://gerrit.ovirt.org/65562 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7d00b897e430d9c4e8a23cb1451209b6f00e688 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Milan Zamazal <mzamazal(a)redhat.com>

5 11

Change in vdsm[master]: automation: Create coverage report sooner
by Nir Soffer 03 Nov '16

03 Nov '16

Nir Soffer has uploaded a new change for review. Change subject: automation: Create coverage report sooner ...................................................................... automation: Create coverage report sooner For some reason a build artifacts step was inserted before creating the coverage report. There is no reason not to create the report immediately after running the tests, and jenkins seems to fail in an unclear way just after creating the report. Change-Id: I8688383eb5e99fdd0ee48815cc71afd6483819b4 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M automation/check-patch.sh 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/65414/1 diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 3284e2b..9311671 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -16,6 +16,11 @@ TIMEOUT=600 make check NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE="$PWD/vdsm,$PWD/lib" +# Generate coverage report in HTML format +pushd tests +coverage html -d "$EXPORT_DIR/htmlcov" +popd + # enable complex globs shopt -s extglob # In case of vdsm specfile or any Makefile.am file modification in commit, @@ -24,8 +29,3 @@ ./automation/build-artifacts.sh yum -y install "$EXPORT_DIR/"!(*.src).rpm fi - -# Generate coverage report in HTML format -pushd tests -coverage html -d "$EXPORT_DIR/htmlcov" -popd -- To view, visit https://gerrit.ovirt.org/65414 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8688383eb5e99fdd0ee48815cc71afd6483819b4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

6 9

Change in vdsm[master]: storage: Extend the API for IPv6 iSCSI targets
by dholler＠redhat.com 03 Nov '16

03 Nov '16

Dominik Holler has uploaded a new change for review. Change subject: storage: Extend the API for IPv6 iSCSI targets ...................................................................... storage: Extend the API for IPv6 iSCSI targets A new parameter is introduced in the API, to explicitly indicate the capability of the client to handle IPv6 iSCSI targets. This parameter is used to present IPv6 iSCSI targets only to clients, which has this capability. Change-Id: Iecb45e326d9c551fb636f309f9e945023143dd9c Bug-Url: https://bugzilla.redhat.com/1308306 Signed-off-by: Dominik Holler <dholler(a)redhat.com> --- M lib/api/vdsm-api.yml M lib/vdsm/rpc/bindingxmlrpc.py M vdsm/API.py M vdsm/storage/hsm.py 4 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/65794/1 diff --git a/lib/api/vdsm-api.yml b/lib/api/vdsm-api.yml index f311b17..d0e5a20 100644 --- a/lib/api/vdsm-api.yml +++ b/lib/api/vdsm-api.yml @@ -7713,6 +7713,11 @@ description: The password associated with the given username name: password type: string + + - defaultvalue: false + description: If true, the returned list includes porals on IPv6 + name: ipv6Targets + type: boolean return: description: 'A list of discovered targets in the form: ''<host>:<port>,<tpgt><iqn>''' diff --git a/lib/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py index b8bb3f6..f747304 100644 --- a/lib/vdsm/rpc/bindingxmlrpc.py +++ b/lib/vdsm/rpc/bindingxmlrpc.py @@ -984,8 +984,10 @@ def iscsiDiscoverSendTargets(self, con, options=None): con = protect_passwords(con) + ipv6Targets = con['ipv6Targets'] if 'ipv6Targets' in con else False iscsiConn = API.ISCSIConnection(con['connection'], con['port'], - con['user'], con['password']) + con['user'], con['password'], + ipv6Targets) return iscsiConn.discoverSendTargets() def vgCreate(self, name, devlist, force=False): diff --git a/vdsm/API.py b/vdsm/API.py index f000297..da80afe 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1012,18 +1012,20 @@ class ISCSIConnection(APIBase): - ctorArgs = ['host', 'port', 'user', 'password'] + ctorArgs = ['host', 'port', 'user', 'password', 'ipv6Targets'] - def __init__(self, host, port, user="", password=""): + def __init__(self, host, port, user="", password="", ipv6Targets=False): APIBase.__init__(self) self._host = host self._port = port self._user = user self._pass = password + self._ipv6Targets = ipv6Targets def discoverSendTargets(self): params = {'connection': self._host, 'port': self._port, - 'user': self._user, 'password': self._pass} + 'user': self._user, 'password': self._pass, + 'ipv6Targets': self._ipv6Targets} return self._irs.discoverSendTargets(params) diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index e472b1c..9d5f97d 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2915,6 +2915,7 @@ """ ip = con['connection'] port = int(con['port']) + ipv6Targets = con['ipv6Targets'] username = con['user'] password = con['password'] if username == "": @@ -2937,9 +2938,10 @@ fullTargets = [] partialTargets = [] for target in targets: - fullTargets.append(iscsi.getTargetString(target.portal, - target.tpgt, target.iqn)) - partialTargets.append(target.iqn) + if ipv6Targets or not target.portal.startswith("["): + fullTargets.append(iscsi.getTargetString(target.portal, + target.tpgt, target.iqn)) + partialTargets.append(target.iqn) return dict(targets=partialTargets, fullTargets=fullTargets) -- To view, visit https://gerrit.ovirt.org/65794 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb45e326d9c551fb636f309f9e945023143dd9c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dominik Holler <dholler(a)redhat.com>

5 8

Change in vdsm[master]: storage: prepare iscsi for IPv6 targets
by dholler＠redhat.com 03 Nov '16

03 Nov '16

Dominik Holler has uploaded a new change for review. Change subject: storage: prepare iscsi for IPv6 targets ...................................................................... storage: prepare iscsi for IPv6 targets The used iscsiadm tool expects IPv6 addresses in square brackets if a port is appended. For this reason this patch encapsulates hostnames given as IPv6 addresses in square brackets. Change-Id: I1e1e1ffe1c5d09b7bc3767d84a99711986eaef97 Bug-Url: https://bugzilla.redhat.com/1308306 Signed-off-by: Dominik Holler <dholler(a)redhat.com> --- M vdsm/storage/iscsi.py 1 file changed, 29 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/65696/5 diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index 4df844c..72320ff 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -35,6 +35,8 @@ from vdsm import supervdsm from vdsm.config import config from vdsm.network.netinfo.routes import getRouteDeviceTo +from vdsm.network.errors import ConfigNetworkError +from vdsm.network.ip.address import IPv6 from vdsm.password import ProtectedPassword from vdsm.storage import devicemapper from vdsm.storage import misc @@ -53,6 +55,28 @@ _iscsiadmTransactionLock = RLock() log = logging.getLogger('storage.ISCSI') + +def getTargetString(portal, tpgt=None, iqn=None): + hostname = portal.hostname + try: + IPv6.validateAddress(hostname) + hostname = "[%s]" % hostname + except ConfigNetworkError: + pass + + portalStr = "%s:%d" % (hostname, portal.port) + + if tpgt is None: + tpgtStr = "" + else: + tpgtStr = ",%d" % tpgt + + if iqn is None: + iqnStr= "" + else: + iqnStr = " %s" % iqn + + return "%s%s%s" % (portalStr, tpgtStr, iqnStr) def getDevIscsiSessionId(dev): @@ -189,8 +213,7 @@ # bounded iface. Explicitly specifying tpgt on iSCSI login imposes creation # of the node record in the new style format which enables to access a # portal through multiple ifaces for multipathing. - portalStr = "%s:%d,%d" % (target.portal.hostname, target.portal.port, - target.tpgt) + portalStr = getTargetString(target.portal, target.tpgt) with _iscsiadmTransactionLock: iscsiadm.node_new(iface.name, portalStr, target.iqn) try: @@ -216,8 +239,7 @@ # Basically this command deleting a node record (see addIscsiNode). # Once we create a record in the new style format by specifying a tpgt, # we delete it in the same way. - portalStr = "%s:%d,%d" % (target.portal.hostname, target.portal.port, - target.tpgt) + portalStr = getTargetString(target.portal, target.tpgt) with _iscsiadmTransactionLock: try: iscsiadm.node_disconnect(iface.name, portalStr, target.iqn) @@ -230,7 +252,7 @@ def addIscsiPortal(iface, portal, credentials=None): discoverType = "sendtargets" - portalStr = "%s:%d" % (portal.hostname, portal.port) + portalStr = getTargetString(portal) with _iscsiadmTransactionLock: iscsiadm.discoverydb_new(discoverType, iface.name, portalStr) @@ -251,7 +273,7 @@ def deleteIscsiPortal(iface, portal): discoverType = "sendtargets" - portalStr = "%s:%d" % (portal.hostname, portal.port) + portalStr = getTargetString(portal) iscsiadm.discoverydb_delete(discoverType, iface.name, portalStr) @@ -259,7 +281,7 @@ # Because proper discovery actually has to clear the DB having multiple # discoveries at once will cause unpredictable results discoverType = "sendtargets" - portalStr = "%s:%d" % (portal.hostname, portal.port) + portalStr = getTargetString(portal) with _iscsiadmTransactionLock: addIscsiPortal(iface, portal, credentials) -- To view, visit https://gerrit.ovirt.org/65696 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e1e1ffe1c5d09b7bc3767d84a99711986eaef97 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dominik Holler <dholler(a)redhat.com>

7 24

Change in vdsm[master]: vm: legacy rng devices fix not needed anymore
by fromani＠redhat.com 03 Nov '16

03 Nov '16

Francesco Romani has uploaded a new change for review. Change subject: vm: legacy rng devices fix not needed anymore ...................................................................... vm: legacy rng devices fix not needed anymore We introduced this fix to deal with upgrades from Vdsm 4.16.z, and we don't need this anymore. Change-Id: I34eef559ef3d789fd502490acc9691df15c684b9 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 0 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/61243/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 61a59ca..df32da0 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1647,13 +1647,6 @@ self._updateDomainDescriptor() - # REQUIRED_FOR migrate from vdsm-4.16 - # - # We need to clean out unknown devices that are created for - # RNG devices by VDSM 3.5 and are left in the configuration - # after upgrade to 3.6. - self._fixLegacyRngConf() - self._getUnderlyingVmDevicesInfo() self._updateAgentChannels() @@ -4604,25 +4597,6 @@ newChain = [x for x in device['volumeChain'] if x['volumeID'] in volumes] device['volumeChain'] = drive.volumeChain = newChain - - def _fixLegacyRngConf(self): - def _is_legacy_rng_device_conf(dev): - """ - Returns True if dev is a legacy (3.5) RNG device conf, - False otherwise. - """ - return dev['type'] == hwclass.RNG and ( - 'specParams' not in dev or - 'source' not in dev['specParams'] - ) - - with self._confLock: - self._devices[hwclass.RNG] = [dev for dev - in self._devices[hwclass.RNG] - if 'source' in dev.specParams] - self.conf['devices'] = [dev for dev - in self.conf['devices'] - if not _is_legacy_rng_device_conf(dev)] def getDiskDevices(self): return self._devices[hwclass.DISK] -- To view, visit https://gerrit.ovirt.org/61243 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34eef559ef3d789fd502490acc9691df15c684b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 4

← Newer
1
2
3
4
5
6
7
8
9
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2016