April 2016 - vdsm-patches - Fedora mailing-lists

Change in vdsm[master]: storage: Do not count garbage volumes as children
by alitke＠redhat.com 13 Aug '16

13 Aug '16

Adam Litke has uploaded a new change for review. Change subject: storage: Do not count garbage volumes as children ...................................................................... storage: Do not count garbage volumes as children Change-Id: Ice3c70249cbc3577b239bd11d224955f2e29b211 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockVolume.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/44573/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 51f60ea..9baa3d2 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -184,7 +184,7 @@ lvs = lvm.lvsByTag(self.sdUUID, "%s%s" % (TAG_PREFIX_PARENT, self.volUUID)) - return tuple(lv.name for lv in lvs if TAG_VOL_UNINIT not in lv.tags) + return tuple(lv.name for lv in lvs if TAG_VOL_GARBAGE not in lv.tags) def getImage(self): """ -- To view, visit https://gerrit.ovirt.org/44573 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice3c70249cbc3577b239bd11d224955f2e29b211 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 3

Change in vdsm[master]: storage: export volume lease state in getVolumeInfo
by alitke＠redhat.com 12 Aug '16

12 Aug '16

Adam Litke has uploaded a new change for review. Change subject: storage: export volume lease state in getVolumeInfo ...................................................................... storage: export volume lease state in getVolumeInfo In order to support an entity-based polling methodology (ie. in the new SDM verbs) we must know whether a volume is currently locked by a long running operation. Extend the getVolumeInfo API to report whether the lease is free or held. Change-Id: I55f062a4be15593fdc98518fd0a113976cbe0ae7 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/volume.py 2 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/38623/1 diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 988ce64..cba1008 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -7897,6 +7897,19 @@ {'enum': 'VolumeStatus', 'data': ['OK', 'INVALID', 'ILLEGAL']} ## +# @VolumeLeaseState: +# +# An enumeration of Volume lease states. +# +# @FREE: The lease is free +# +# @HELD: The lease is held +# +# Since: 4.10.0 +## +{'enum': 'VolumeLeaseState', 'data': ['FREE', 'HELD']} + +## # @VolumeInfo: # # Information about a Volume. @@ -7937,6 +7950,8 @@ # # @children: A list of decendent Volumes that depend on this Volume # +# @leaseState: #optional The state of the volume lease +# # Since: 4.10.0 ## {'type': 'VolumeInfo', @@ -7946,7 +7961,8 @@ 'description': 'str', 'pool': 'UUID', 'domain': 'UUID', 'image': 'UUID', 'ctime': 'int', '*mtime': 'uint', 'legality': 'VolumeLegality', 'apparentsize': 'uint', - 'truesize': 'uint', 'status': 'VolumeStatus', 'children': ['UUID']}} + 'truesize': 'uint', 'status': 'VolumeStatus', 'children': ['UUID'], + '*leaseState': 'VolumeLeaseState'}} ## # @Volume.getInfo: diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 980b6e3..2e16efc 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -33,6 +33,7 @@ import fileUtils import task from threadLocal import vars +from clusterlock import InquireNotSupportedError import resourceFactories import resourceManager as rm rmanager = rm.ResourceManager.getInstance() @@ -85,6 +86,10 @@ ILLEGAL_VOL = "ILLEGAL" LEGAL_VOL = "LEGAL" FAKE_VOL = "FAKE" + +# Volume lease states +LEASE_FREE = "FREE" +LEASE_HELD = "HELD" log = logging.getLogger('Storage.Volume') @@ -839,6 +844,11 @@ cls.createMetadata(metaId, meta) return meta + def getLeaseState(self): + ver, owners = sdCache.produce(self.sdUUID).inquireVolumeLease( + self.imgUUID, self.volUUID) + return LEASE_HELD if owners else LEASE_FREE + def getInfo(self): """ Get volume info @@ -857,6 +867,10 @@ info['apparentsize'] = str(vsize) info['truesize'] = str(avsize) info['status'] = "OK" + try: + info['leaseState'] = self.getLeaseState() + except InquireNotSupportedError: + pass except se.StorageException as e: self.log.debug("exception: %s:%s" % (str(e.message), str(e.value))) info['apparentsize'] = "0" -- To view, visit https://gerrit.ovirt.org/38623 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55f062a4be15593fdc98518fd0a113976cbe0ae7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

6 40

Change in vdsm[master]: misc: remove cp parameter
by ykaplan＠redhat.com 06 Aug '16

06 Aug '16

Yeela Kaplan has uploaded a new change for review. Change subject: misc: remove cp parameter ...................................................................... misc: remove cp parameter All usages of cp parameter have been extinguished. Therefore, no longer needed. Change-Id: I0906bfd7dfa128c323aa399810bbd75883618434 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M vdsm/storage/misc.py 1 file changed, 5 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/45613/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index b14fd26..b0146c8 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -449,7 +449,7 @@ return n -def rotateFiles(directory, prefixName, gen, cp=False, persist=False): +def rotateFiles(directory, prefixName, gen, persist=False): log.debug("dir: %s, prefixName: %s, versions: %s" % (directory, prefixName, gen)) gen = int(gen) @@ -477,24 +477,16 @@ for key in keys: oldName = os.path.join(directory, fd[key]['old']) newName = os.path.join(directory, fd[key]['new']) - if utils.isOvirtNode() and persist and not cp: + if utils.isOvirtNode() and persist: try: utils.unpersist(oldName) utils.unpersist(newName) except: pass - try: - if cp: - execCmd([constants.EXT_CP, oldName, newName], sudo=True) - if (utils.isOvirtNode() and - persist and not os.path.exists(newName)): - utils.persist(newName) - else: - os.rename(oldName, newName) - except: - pass - if utils.isOvirtNode() and persist and not cp: + os.rename(oldName, newName) + + if utils.isOvirtNode() and persist: try: utils.persist(newName) except: -- To view, visit https://gerrit.ovirt.org/45613 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0906bfd7dfa128c323aa399810bbd75883618434 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

5 17

Change in vdsm[master]: freeze: Freeze guest even when creating memory snapshot
by Nir Soffer 30 Jul '16

30 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: freeze: Freeze guest even when creating memory snapshot ...................................................................... freeze: Freeze guest even when creating memory snapshot We used to skip freezing the guest if creating memory snapshot. This was probably done because qemu is pausing the vm for creating memory snapshot. However, this is not consistent with snapshots of external disks such as network disks, where we always freeze the vm before taking the snapshot. Also, it is probably safer to freeze even when creating memory snapshot, giving applications on the guest chance to pause in consistent state. This patch removes the check for memory snapshot, and freeze the guest unless it is already frozen. Change-Id: I8aa7ac0dea8690ca33df8067f84734d788da8bf8 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/43299/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 332281b..ecbbe1d 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -3093,9 +3093,6 @@ else: snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY - # When creating memory snapshot libvirt will pause the vm - should_freeze = not (memoryParams or frozen) - snapxml = snap.toprettyxml() # TODO: this is debug information. For 3.6.x we still need to # see the XML even with 'info' as default level. @@ -3109,7 +3106,7 @@ self.stopDisksStatsCollection() try: - if should_freeze: + if not frozen: freezed = self.freeze() try: self._dom.snapshotCreateXML(snapxml, snapFlags) @@ -3120,7 +3117,7 @@ # Must always thaw, even if freeze failed; in case the guest # did freeze the filesystems, but failed to reply in time. # Libvirt is using same logic (see src/qemu/qemu_driver.c). - if should_freeze: + if not frozen: self.thaw() # We are padding the memory volume with block size of zeroes @@ -3148,7 +3145,7 @@ # Returning quiesce to notify the manager whether the guest agent # froze and flushed the filesystems or not. return {'status': doneCode, - 'quiesce': should_freeze and freezed["status"]["code"] == 0} + 'quiesce': not frozen and freezed["status"]["code"] == 0} def diskReplicateStart(self, srcDisk, dstDisk): try: -- To view, visit https://gerrit.ovirt.org/43299 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8aa7ac0dea8690ca33df8067f84734d788da8bf8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 14

Change in vdsm[master]: log: Use INFO log level as default
by Nir Soffer 27 Jul '16

27 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: log: Use INFO log level as default ...................................................................... log: Use INFO log level as default The current logs are much too verbose which cause trouble for users, and make us look unprofessional. Mature project should not use debug log by default. To debug issues that are not clear enough using INFO logs, the relevant logger level can be modified on a user machine as needed. Change-Id: I767dcd9bad7b9fbeebb438e9ef13cb0ec3f042ee Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/logger.conf.in 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/32504/1 diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index 64b154f..8e963dd 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -8,18 +8,18 @@ keys=long,simple,none,sysform [logger_root] -level=DEBUG +level=INFO handlers=syslog,logfile propagate=0 [logger_vds] -level=DEBUG +level=INFO handlers=syslog,logfile qualname=vds propagate=0 [logger_Storage] -level=DEBUG +level=INFO handlers=logfile qualname=Storage propagate=0 @@ -31,7 +31,7 @@ propagate=1 [logger_connectivity] -level=DEBUG +level=INFO handlers=connlogfile qualname=connectivity propagate=0 -- To view, visit http://gerrit.ovirt.org/32504 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I767dcd9bad7b9fbeebb438e9ef13cb0ec3f042ee Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

9 23

Change in vdsm[master]: tests: JsonRpcClient tests suite
by Piotr Kliczewski 25 Jul '16

25 Jul '16

Piotr Kliczewski has uploaded a new change for review. Change subject: tests: JsonRpcClient tests suite ...................................................................... tests: JsonRpcClient tests suite Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> Change-Id: I48c209915f4047958fd9b7e5dd6a202ca14a50cb --- M tests/Makefile.am A tests/jsonrpcClientTests.py M tests/stompAdapterTests.py 3 files changed, 159 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/43582/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 9a7f81f..a010bb3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -57,6 +57,7 @@ iproute2Tests.py \ ipwrapperTests.py \ iscsiTests.py \ + jsonrpcClientTests.py \ jsonrpcServerTests.py \ libvirtconnectionTests.py \ lvmTests.py \ diff --git a/tests/jsonrpcClientTests.py b/tests/jsonrpcClientTests.py new file mode 100644 index 0000000..5d4304f --- /dev/null +++ b/tests/jsonrpcClientTests.py @@ -0,0 +1,148 @@ +# +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from Queue import Queue +from threading import Event + +from testlib import VdsmTestCase as TestCaseBase +from yajsonrpc.stompreactor import ClientRpcTransportAdapter +from yajsonrpc import JsonRpcClient, JsonRpcRequest, JsonRpcResponse +from yajsonrpc.stomp import Frame, Headers +from vdsm.compat import json + +from stompAdapterTests import TestSubscription + + +ID = 'e8a936a6-d886-4cfa-97b9-2d54209053ff' + + +class TestClient(object): + + def __init__(self): + self._queue = Queue() + self.closed = False + + def send(self, data, destination, headers): + self._queue.put_nowait((data, destination, headers)) + + def pop_message(self): + return self._queue.get(True, 3) + + @property + def has_outgoing_messages(self): + return (self._queue.qsize() > 0) + + def close(self): + self.closed = True + + +class JsonrpcClientTest(TestCaseBase): + + def test_call(self): + subscription = TestSubscription('jms.topic.vdsm_responses', + 'ad052acb-a934-4e10-8ec3-00c7417ef8d1') + client = TestClient() + subscription.set_client(client) + + json_client = JsonRpcClient( + ClientRpcTransportAdapter(subscription, + 'jms.topic.vdsm_requests', + client) + ) + + request = JsonRpcRequest('my_method', (), ID) + json_client.call(request, timeout=0) + + self.assertTrue(client.has_outgoing_messages) + data, destination, headers = client.pop_message() + + req = JsonRpcRequest.fromRawObject(json.loads(data)[0]) + self.assertEquals(req.method, request.method) + self.assertEquals(req.id, request.id) + + self.assertEquals('jms.topic.vdsm_requests', destination) + + self.assertEquals(headers[Headers.CONTENT_TYPE], 'application/json') + self.assertEquals(headers[Headers.REPLY_TO], + 'jms.topic.vdsm_responses') + + def test_async_call_with_response(self): + subscription = TestSubscription('jms.topic.vdsm_responses', + 'ad052acb-a934-4e10-8ec3-00c7417ef8d1') + client = TestClient() + subscription.set_client(client) + + json_client = JsonRpcClient( + ClientRpcTransportAdapter(subscription, + 'jms.topic.vdsm_requests', + client) + ) + + request = JsonRpcRequest('my_method', (), ID) + call = json_client.call_async(request) + + self.assertTrue(client.has_outgoing_messages) + + response = JsonRpcResponse(result='my_response', reqId=ID) + subscription.process(Frame(body=response.encode())) + + self.assertTrue(call.isSet()) + self.assertEquals('my_response', call.responses[0].result) + + def test_receive_event(self): + subscription = TestSubscription('jms.topic.vdsm_responses', + 'ad052acb-a934-4e10-8ec3-00c7417ef8d1') + client = TestClient() + subscription.set_client(client) + ev = Event() + + json_client = JsonRpcClient( + ClientRpcTransportAdapter(subscription, + 'jms.topic.vdsm_requests', + client) + ) + + def callback(client, event, params): + self.assertEquals(event, 'localhost|component|operation|id') + self.assertEquals(params['my_property'], 'my_value') + ev.set() + + json_client.registerEventCallback(callback) + + event = JsonRpcRequest('localhost|component|operation|id', + {'my_property': 'my_value'}) + + subscription.process(Frame(body=event.encode())) + ev.wait(timeout=3) + self.assertTrue(ev.is_set()) + + def test_close(self): + subscription = TestSubscription('jms.topic.vdsm_responses', + 'ad052acb-a934-4e10-8ec3-00c7417ef8d1') + client = TestClient() + + json_client = JsonRpcClient( + ClientRpcTransportAdapter(subscription, + 'jms.topic.vdsm_requests', + client) + ) + + json_client.close() + self.assertTrue(client.closed) + self.assertTrue(subscription.unsubscribed) diff --git a/tests/stompAdapterTests.py b/tests/stompAdapterTests.py index a0be47f..68fae77 100644 --- a/tests/stompAdapterTests.py +++ b/tests/stompAdapterTests.py @@ -60,6 +60,7 @@ def __init__(self, destination, id): self._destination = destination self._id = id + self.unsubscribed = False def set_client(self, client): self._client = TestConnection(client) @@ -76,6 +77,15 @@ def client(self): return self._client + def set_message_handler(self, message_handler): + self.handler = message_handler + + def process(self, data): + self.handler(None, data) + + def unsubscribe(self): + self.unsubscribed = True + class ConnectFrameTest(TestCaseBase): -- To view, visit https://gerrit.ovirt.org/43582 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48c209915f4047958fd9b7e5dd6a202ca14a50cb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

2 7

Change in vdsm[master]: tests: JsonRpcServer tests suite
by Piotr Kliczewski 25 Jul '16

25 Jul '16

Piotr Kliczewski has uploaded a new change for review. Change subject: tests: JsonRpcServer tests suite ...................................................................... tests: JsonRpcServer tests suite Change-Id: I1090764c7289544abe331a13ec765ceed2a53afe Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M lib/yajsonrpc/__init__.py M tests/Makefile.am A tests/jsonrpcServerTests.py 3 files changed, 133 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/43581/1 diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py index 68af242..a307c7d 100644 --- a/lib/yajsonrpc/__init__.py +++ b/lib/yajsonrpc/__init__.py @@ -293,7 +293,12 @@ self._responses.append(response) def requestDone(self, response): - del self._requests[response.id] + try: + del self._requests[response.id] + except KeyError: + # ignore when request had no id + pass + self.addResponse(response) self.sendReply() diff --git a/tests/Makefile.am b/tests/Makefile.am index 15dbd7b..9a7f81f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -57,6 +57,7 @@ iproute2Tests.py \ ipwrapperTests.py \ iscsiTests.py \ + jsonrpcServerTests.py \ libvirtconnectionTests.py \ lvmTests.py \ main.py \ diff --git a/tests/jsonrpcServerTests.py b/tests/jsonrpcServerTests.py new file mode 100644 index 0000000..6c508c2 --- /dev/null +++ b/tests/jsonrpcServerTests.py @@ -0,0 +1,126 @@ +# +# Copyright 2015 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 +# +import threading +from contextlib import contextmanager +from Queue import Queue + +from testlib import VdsmTestCase as TestCaseBase +from yajsonrpc import JsonRpcServer, JsonRpcResponse, JsonRpcRequest + + +ID = 'e8a936a6-d886-4cfa-97b9-2d54209053ff' + + +class FakeBridge(object): + + def get_text(self): + return 'my text' + + def register_server_address(self, server_address): + self.server_address = server_address + + def unregister_server_address(self): + self.server_address = None + + +class TestClient(object): + + def __init__(self): + self._queue = Queue() + + def send(self, data): + self._queue.put_nowait(data) + + def pop_message(self): + return self._queue.get(True, 3) + + @property + def has_outgoing_messages(self): + return (self._queue.qsize() > 0) + + +class TestConnection(object): + + def get_local_address(self): + return 'localhost' + + +@contextmanager +def create_server(bridge): + server = JsonRpcServer(bridge, 3600) + t = threading.Thread(target=server.serve_requests, + name='JsonRpcServer') + t.setDaemon(True) + t.start() + + try: + yield server + finally: + server.stop() + + +class JsonrpcServerTest(TestCaseBase): + + def test_method_call(self): + request = JsonRpcRequest(method='get_text', params=(), reqId=ID) + client = TestClient() + + with create_server(FakeBridge()) as server: + server.queueRequest((client, TestConnection(), request.encode())) + + response = client.pop_message() + self.assertIsNot(response, None) + res = JsonRpcResponse.decode(response) + self.assertEquals(res.result, 'my text') + + def test_not_existing_method(self): + request = JsonRpcRequest(method='abcd', params=(), reqId=ID) + client = TestClient() + + with create_server(FakeBridge()) as server: + server.queueRequest((client, TestConnection(), request.encode())) + + response = client.pop_message() + self.assertIsNot(response, None) + res = JsonRpcResponse.decode(response) + self.assertEquals(res.error['code'], -32601) + + def test_wrong_param(self): + request = JsonRpcRequest(method='get_text', params=('param',), + reqId=ID) + client = TestClient() + + with create_server(FakeBridge()) as server: + server.queueRequest((client, TestConnection(), request.encode())) + + response = client.pop_message() + self.assertIsNot(response, None) + res = JsonRpcResponse.decode(response) + self.assertEquals(res.error['code'], -32603) + + def test_no_request_id(self): + request = JsonRpcRequest(method='get_text', params=()) + client = TestClient() + + with create_server(FakeBridge()) as server: + server.queueRequest((client, TestConnection(), request.encode())) + + response = client.pop_message() + self.assertIsNot(response, None) -- To view, visit https://gerrit.ovirt.org/43581 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1090764c7289544abe331a13ec765ceed2a53afe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

2 8

Change in vdsm[master]: vm: Cleanup waiting for xml update
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: vm: Cleanup waiting for xml update ...................................................................... vm: Cleanup waiting for xml update This patch cleans up a bit the code for waiting until libvirt xml is updated after pivot was completed. - Clarify confusing log message claiming that pivot failed after it completed successfully - Cleanup creation of volumes lists using generator expression - More clear logic for checking current volumes list - Replace detailed log message and unhelpful exception with detailed exception - Move comment out of the loop to make the loop more clear - Remove unneeded keys() calls when looking up alias in chains This code was added as temporary solution until libvirt is fixed, but I think we would like keep a simplified version of it even after libvirt is fixed, verifying that the operation was successful. Change-Id: I9fec5416a62736bad461ddd0b54093d23960b7a6 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 27 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/39938/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index efadbdb..8ece47b 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -5100,40 +5100,43 @@ # synchronized and we may start the vm with a stale volume in the # future. See https://bugzilla.redhat.com/show_bug.cgi?id=1202719 for # more details. - # TODO: Remove once we depend on a libvirt with this bug fixed. # We expect libvirt to show that the original leaf has been removed # from the active volume chain. origVols = sorted([x['volumeID'] for x in self.drive.volumeChain]) - expectedVols = origVols[:] - expectedVols.remove(self.drive.volumeID) + expectedVols = [v for v in origVols if v != self.driveVolumeID] alias = self.drive['alias'] self.vm.log.info("Waiting for libvirt to update the XML after pivot " "of drive %s completed", alias) - while True: - # This operation should complete in either one or two iterations of - # this loop. Until libvirt updates the XML there is nothing to do - # but wait. While we wait we continue to tell engine that the job - # is ongoing. If we are still in this loop when the VM is powered - # off, the merge will be resolved manually by engine using the - # reconcileVolumeChain verb. - chains = self.vm._driveGetActualVolumeChain([self.drive]) - if alias not in chains.keys(): - raise RuntimeError("Failed to retrieve volume chain for " - "drive %s. Pivot failed.", alias) - curVols = sorted([entry.uuid for entry in chains[alias]]) - if curVols == origVols: - time.sleep(1) - elif curVols == expectedVols: + # This operation should complete in either one or two iterations of + # this loop. Until libvirt updates the XML there is nothing to do + # but wait. While we wait we continue to tell engine that the job + # is ongoing. If we are still in this loop when the VM is powered + # off, the merge will be resolved manually by engine using the + # reconcileVolumeChain verb. + # TODO: Check once when we depend on a libvirt with this bug fixed. + + while True: + chains = self.vm._driveGetActualVolumeChain([self.drive]) + if alias not in chains: + raise RuntimeError("Failed to retrieve volume chain for " + "drive %s after pivot completed", alias) + + curVols = sorted(entry.uuid for entry in chains[alias]) + + if curVols == expectedVols: self.vm.log.info("The XML update has been completed") - break - else: - self.log.error("Bad volume chain found for drive %s. Previous " - "chain: %s, Expected chain: %s, Actual chain: " - "%s", alias, origVols, expectedVols, curVols) - raise RuntimeError("Bad volume chain found") + return + + if curVols != origVols: + raise RuntimeError( + "Bad volume chain after pivot for drive %s. Previous " + "chain: %s, Expected chain: %s, Actual chain: %s" % + (alias, origVols, expectedVols, curVols)) + + time.sleep(1) def _devicesWithAlias(domXML): -- To view, visit https://gerrit.ovirt.org/39938 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fec5416a62736bad461ddd0b54093d23960b7a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

3 7

Change in vdsm[master]: fc-scan: Use utilities from vdsm library.
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: fc-scan: Use utilities from vdsm library. ...................................................................... fc-scan: Use utilities from vdsm library. Replace low level threading code with simpler concurrent.tmap() call and duplicate monotonic_time() with utils.monotonic_time(). Change-Id: Ic48748d6a43d41e034e16cb4f636ebe627881590 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/fc-scan 1 file changed, 24 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/38466/1 diff --git a/vdsm/storage/fc-scan b/vdsm/storage/fc-scan index 344345d..c746ea4 100755 --- a/vdsm/storage/fc-scan +++ b/vdsm/storage/fc-scan @@ -38,43 +38,11 @@ import logging import os import sys -import threading + +from vdsm import concurrent +from vdsm import utils log = logging.getLogger("fc-scan") - - -class Scan(object): - - def __init__(self, host): - self.host = host - self.succeeded = False - self.thread = None - - def start(self): - self.thread = threading.Thread(target=self.run) - self.thread.daemon = True - self.thread.start() - - def wait(self): - self.thread.join() - - def run(self): - try: - path = "/sys/class/scsi_host/%s/scan" % self.host - log.debug("Scanning %s", path) - start = monotonic_time() - fd = os.open(path, os.O_WRONLY) - try: - os.write(fd, "- - -") - finally: - os.close(fd) - self.succeeded = True - elapsed = monotonic_time() - start - log.debug("Scanned %s in %.2f seconds", path, elapsed) - except OSError as e: - log.error("Scanning %s failed: %s", path, e) - except Exception: - log.exception("Scanning %s failed", path) def main(args): @@ -93,22 +61,32 @@ log.debug("No fc_host found") return 0 - scans = [] - - for host in hosts: - s = Scan(host) - s.start() - scans.append(s) - - for s in scans: - s.wait() + scans = concurrent.tmap(scan_host, hosts) if not all(s.succeeded for s in scans): return 1 + return 0 -def monotonic_time(): - return os.times()[4] + +def scan_host(name): + try: + path = "/sys/class/scsi_host/%s/scan" % name + log.debug("Scanning %s", path) + start = utils.monotonic_time() + fd = os.open(path, os.O_WRONLY) + try: + os.write(fd, "- - -") + finally: + os.close(fd) + elapsed = utils.monotonic_time() - start + log.debug("Scanned %s in %.2f seconds", path, elapsed) + except OSError as e: + log.error("Scanning %s failed: %s", path, e) + raise + except Exception: + log.exception("Scanning %s failed", path) + raise if __name__ == '__main__': -- To view, visit https://gerrit.ovirt.org/38466 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic48748d6a43d41e034e16cb4f636ebe627881590 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

8 24

Change in vdsm[master]: lib: Revert and refine error handling in tmap()
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: lib: Revert and refine error handling in tmap() ...................................................................... lib: Revert and refine error handling in tmap() In commit 2b7155b696 (lib: Simplify and generalize concurrent.tmap()), we simplified error handling by returning a named tuple with function results. This turned out less useful then the original error handling. This patch returns the previous error handling: - Functions passed to tmap() should not raise - if they raise, this is considered a bug in the function. - The last error is raised by tmap() instead of returning the result. This make it easier to fail loudly for unexpected errors. - The original exception is re-raised now with the original traceback. - Error handling is documented properly now Previously you had to make sure function raises to signal failures: def func(): try: code that should not fail... code that may fail... code that should not fail... except ExpectedError: log.error(...) raise except Exception: log.exception(...) raise results = concurrent.tmap(func, values) if not all(r.succeeded for r in results): ... Returning the result as is lets us have nicer code: def func(): code that should not fail... try: code that may fail... except ExpectedError: log.error(...) return False code that should not fail... return True succeeded = concurrent.tmap(func, values) if not all(succeeded): ... We can ignore unexpected errors, since tmap() will log them and fail loudly. We can also minimize try except block for expected errors. Change-Id: I0154b28ff7822c63e77181bbbf444c712bd0c31e Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/concurrent.py M tests/concurrentTests.py 2 files changed, 45 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/39211/1 diff --git a/lib/vdsm/concurrent.py b/lib/vdsm/concurrent.py index 64e072d..5498052 100644 --- a/lib/vdsm/concurrent.py +++ b/lib/vdsm/concurrent.py @@ -18,22 +18,42 @@ # Refer to the README and COPYING files for full details of the license # +import logging import threading -from collections import namedtuple - - -Result = namedtuple("Result", ["succeeded", "value"]) +import sys def tmap(func, iterable): + """ + Run func with arguments from iterable in multiple threads, a returning the + output in order of arguments. + + func should not raise exceptions - we consider this a bug in func, and will + fail the call and re-raise the exception in the caller thread. + + Expected exceptions should be handled in func. If the caller likes to + handle the error later, func should return it: + + def func(value): + try: + return something(value) + except ExpectedError as e: + return e + + Unexpected exceptions should not be handled, as they are logged in the + worker threads and re-raised in the caller thread. If multiple excpetions + raised, only the last one will be re-raised in the caller thread. + """ args = list(iterable) results = [None] * len(args) + error = [None] def worker(i, f, arg): try: - results[i] = Result(True, f(arg)) - except Exception as e: - results[i] = Result(False, e) + results[i] = f(arg) + except Exception: + error[0] = sys.exc_info() + logging.exception("Unhandled exception in tmap worker thread") threads = [] for i, arg in enumerate(args): @@ -45,4 +65,8 @@ for t in threads: t.join() + if error[0] is not None: + t, v, tb = error[0] + raise t, v, tb + return results diff --git a/tests/concurrentTests.py b/tests/concurrentTests.py index 307e397..5c0646b 100644 --- a/tests/concurrentTests.py +++ b/tests/concurrentTests.py @@ -26,13 +26,16 @@ from vdsm import concurrent +class Error(Exception): + pass + + class TMapTests(VdsmTestCase): def test_results(self): values = tuple(range(10)) results = concurrent.tmap(lambda x: x, values) - expected = [concurrent.Result(True, x) for x in values] - self.assertEqual(results, expected) + self.assertEqual(results, list(values)) def test_results_order(self): def func(x): @@ -40,8 +43,7 @@ return x values = tuple(random.random() * 0.1 for x in range(10)) results = concurrent.tmap(func, values) - expected = [concurrent.Result(True, x) for x in values] - self.assertEqual(results, expected) + self.assertEqual(results, list(values)) def test_concurrency(self): start = time.time() @@ -49,12 +51,12 @@ elapsed = time.time() - start self.assertTrue(0.1 < elapsed < 0.2) - def test_error(self): - error = RuntimeError("No result for you!") - + def test_raise_last_error(self): def func(x): - raise error - - results = concurrent.tmap(func, range(10)) - expected = [concurrent.Result(False, error)] * 10 - self.assertEqual(results, expected) + raise Error(x) + try: + concurrent.tmap(func, (1, 2, 3)) + except Error as e: + self.assertEqual(e.args, (3,)) + else: + self.fail("Exception was not raised") -- To view, visit https://gerrit.ovirt.org/39211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0154b28ff7822c63e77181bbbf444c712bd0c31e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 10

Change in vdsm[master]: virt: Use Drive.diskType instead of networkDev and blockDev
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: virt: Use Drive.diskType instead of networkDev and blockDev ...................................................................... virt: Use Drive.diskType instead of networkDev and blockDev Now that we have explicit diskType we don't need to use the networkDev and blockDev properties. This is very useful when we set libvirt disk type property, or want to check for certain disk type. Change-Id: Id68bc74b3d788dc82fc61bf8c3de5a52164d0989 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/vmStorageTests.py M vdsm/virt/vm.py 2 files changed, 21 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/40472/1 diff --git a/tests/vmStorageTests.py b/tests/vmStorageTests.py index 8e8f7bc..dfe0991 100644 --- a/tests/vmStorageTests.py +++ b/tests/vmStorageTests.py @@ -268,74 +268,69 @@ def test_cdrom(self): conf = drive_config(device='cdrom') drive = Drive({}, self.log, **conf) - self.assertFalse(drive.networkDev) - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.FILE) def test_floppy(self): conf = drive_config(device='floppy') drive = Drive({}, self.log, **conf) - self.assertFalse(drive.networkDev) - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.FILE) def test_network_disk(self): conf = drive_config(diskType=DISK_TYPE.NETWORK) drive = Drive({}, self.log, **conf) - self.assertTrue(drive.networkDev) - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.NETWORK) @MonkeyPatch(utils, 'isBlockDevice', lambda path: True) def test_block_disk(self): conf = drive_config(device='disk') drive = Drive({}, self.log, **conf) - self.assertFalse(drive.networkDev) - self.assertTrue(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.BLOCK) @MonkeyPatch(utils, 'isBlockDevice', lambda path: False) def test_file_disk(self): conf = drive_config(device='disk') drive = Drive({}, self.log, **conf) - self.assertFalse(drive.networkDev) - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.FILE) @MonkeyPatch(utils, 'isBlockDevice', lambda path: False) def test_migrate_from_file_to_block(self): conf = drive_config(path='/filedomain/volume') drive = Drive({}, self.log, **conf) - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.FILE) # Migrate drive to block domain... utils.isBlockDevice = lambda path: True drive.path = "/blockdomain/volume" - self.assertTrue(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.BLOCK) @MonkeyPatch(utils, 'isBlockDevice', lambda path: True) def test_migrate_from_block_to_file(self): conf = drive_config(path='/blockdomain/volume') drive = Drive({}, self.log, **conf) - self.assertTrue(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.BLOCK) # Migrate drive to file domain... utils.isBlockDevice = lambda path: False drive.path = "/filedomain/volume" - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.FILE) @MonkeyPatch(utils, 'isBlockDevice', lambda path: True) def test_migrate_from_block_to_network(self): conf = drive_config(path='/blockdomain/volume') drive = Drive({}, self.log, **conf) - self.assertTrue(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.BLOCK) # Migrate drive to network disk... drive.path = "pool/volume" drive.diskType = DISK_TYPE.NETWORK - self.assertFalse(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.NETWORK) @MonkeyPatch(utils, 'isBlockDevice', lambda path: True) def test_migrate_network_to_block(self): conf = drive_config(diskType=DISK_TYPE.NETWORK, path='pool/volume') drive = Drive({}, self.log, **conf) - self.assertTrue(drive.networkDev) + self.assertEqual(drive.diskType, DISK_TYPE.NETWORK) # Migrate drive to block domain... drive.path = '/blockdomain/volume' drive.diskType = None - self.assertTrue(drive.blockDev) + self.assertEqual(drive.diskType, DISK_TYPE.BLOCK) @expandPermutations diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 78b55c9..a6e742e 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1862,7 +1862,7 @@ def _changeDisk(self, diskDeviceXmlElement): diskType = diskDeviceXmlElement.getAttribute('type') - if diskType not in ['file', 'block']: + if diskType not in (DISK_TYPE.BLOCK, DISK_TYPE.FILE): return diskSerial = diskDeviceXmlElement. \ @@ -1871,13 +1871,12 @@ for vmDrive in self._devices[hwclass.DISK]: if vmDrive.serial == diskSerial: # update the type - diskDeviceXmlElement.setAttribute( - 'type', 'block' if vmDrive.blockDev else 'file') + diskDeviceXmlElement.setAttribute('type', vmDrive.diskType) # update the path + attr = 'dev' if vmDrive.diskType == DISK_TYPE.BLOCK else 'file' diskDeviceXmlElement.getElementsByTagName('source')[0]. \ - setAttribute('dev' if vmDrive.blockDev else 'file', - vmDrive.path) + setAttribute(attr, vmDrive.path) # update the format (the disk might have been collapsed) diskDeviceXmlElement.getElementsByTagName('driver')[0]. \ @@ -2773,7 +2772,7 @@ # we specify type='block' and dev=path for block volumes but we # always speficy the file=path for backwards compatibility. args = {'type': sourceType, 'file': newPath} - if sourceType == 'block': + if sourceType == DISK_TYPE.BLOCK: args['dev'] = newPath disk.appendChildWithArgs('source', **args) return disk @@ -2881,7 +2880,7 @@ newDrives[vmDevName]["format"] = "cow" # We need to keep track of the drive object because we cannot - # safely access the blockDev property until after prepareVolumePath + # safely access the diskType property until after prepareVolumePath vmDrives[vmDevName] = vmDrive # If all the drives are the current ones, return success @@ -2905,9 +2904,8 @@ _rollbackDrives(preparedDrives) return errCode['snapshotErr'] - snapType = 'block' if vmDrives[vmDevName].blockDev else 'file' snapelem = _diskSnapshot(vmDevName, newDrives[vmDevName]["path"], - snapType) + vmDrives[vmDevName].diskType) disks.appendChild(snapelem) snap.appendChild(disks) @@ -4553,7 +4551,7 @@ sourceXML = find_element_by_name(diskXML, 'source') if not sourceXML: break - sourceAttr = ('file', 'dev')[drive.blockDev] + sourceAttr = 'dev' if drive.diskType == DISK_TYPE.BLOCK else 'file' path = sourceXML.getAttribute(sourceAttr) # TODO: Allocation information is not available in the XML. Switch -- To view, visit https://gerrit.ovirt.org/40472 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id68bc74b3d788dc82fc61bf8c3de5a52164d0989 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 11

Change in vdsm[master]: misc: Safer and simpler itmap
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: misc: Safer and simpler itmap ...................................................................... misc: Safer and simpler itmap The previous code had few issues: - It used unlimited number of threads by default. This may lead to creation of 100's of threads if you do not specify a value. - It used non-daemon threads, which could lead to unwanted delay during vdsm shutdown. - It tried to yield results before all arguments were handled. This could lead to unwanted delay in argument processing, if the caller would block processing the results. - It started one thread per value, even if maxthreads was smaller than number of values. - It was too complicated. Changes: - The caller must specify the maximum number of threads. - Use daemon threads - Queue all values before yielding results - Start up to maxthreads worker threads, each processing multiple values - Simplify the code - Add test for error handling Change-Id: Iba6116ac4003702c8e921cebaf494491a6f9afaf Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/miscTests.py M vdsm/storage/misc.py 2 files changed, 42 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/39119/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index 31f64fa..4b3e3c3 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -196,7 +196,7 @@ # outOfProcess operation + 1. it let us know that oop and itmap operate # properly with their limitations data = frozenset(range(oop.HELPERS_PER_DOMAIN + 1)) - ret = frozenset(misc.itmap(dummy, data, misc.UNLIMITED_THREADS)) + ret = frozenset(misc.itmap(dummy, data, len(data))) self.assertEquals(ret, data) def testMoreThreadsThanArgs(self): @@ -207,6 +207,13 @@ data = 1 self.assertRaises(ValueError, misc.itmap(int, data, 0).next) + def testErrors(self): + err = Exception() + def dummy(arg): + raise err + data = [1, 2, 3] + self.assertEqual(list(misc.itmap(dummy, data, 4)), [err] * len(data)) + class RotateFiles(TestCaseBase): diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index eb484c7..463fd04 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -58,7 +58,6 @@ STR_UUID_SIZE = 36 UUID_HYPHENS = [8, 13, 18, 23] MEGA = 1 << 20 -UNLIMITED_THREADS = -1 log = logging.getLogger('Storage.Misc') @@ -882,53 +881,47 @@ raise exception -def itmap(func, iterable, maxthreads=UNLIMITED_THREADS): +def itmap(func, iterable, maxthreads): """ - Make an iterator that computes the function using - arguments from the iterable. It works similar to tmap - by running each operation in a different thread, this - causes the results not to return in any particular - order so it's good if you don't care about the order - of the results. - maxthreads stands for maximum threads that we can initiate simultaneosly. - If we reached to max threads the function waits for thread to - finish before initiate the next one. + Return an iterator calling func with arguments from iterable in multiple threads. + + Unlike tmap, the results are not returned in the original order of the + arguments, and number of threads is limited to maxthreads. """ - if maxthreads < 1 and maxthreads != UNLIMITED_THREADS: - raise ValueError("Wrong input to function itmap: %s", maxthreads) + if maxthreads < 1: + raise ValueError("Invalid maxthreads value: %s" % maxthreads) - respQueue = Queue.Queue() + DONE = object() + values = Queue.Queue() + results = Queue.Queue() - def wrapper(value): - try: - respQueue.put(func(value)) - except Exception as e: - respQueue.put(e) + def worker(): + while True: + value = values.get() + if value is DONE: + return + try: + results.put(func(value)) + except Exception as e: + results.put(e) - threadsCount = 0 - for arg in iterable: - if maxthreads != UNLIMITED_THREADS: - if maxthreads == 0: - # This not supposed to happened. If it does, it's a bug. - # maxthreads should get to 0 only after threadsCount is - # greater than 1 - if threadsCount < 1: - raise RuntimeError("No thread initiated") - else: - yield respQueue.get() - # if yield returns one thread stopped, so we can run - # another thread in queue - maxthreads += 1 - threadsCount -= 1 + count = 0 + threads = 0 - t = threading.Thread(target=wrapper, args=(arg,)) - t.start() - threadsCount += 1 - maxthreads -= 1 + for value in iterable: + values.put(value) + count += 1 + if threads < maxthreads: + t = threading.Thread(target=worker) + t.daemon = True + t.start() + threads += 1 - # waiting for rest threads to end - for i in xrange(threadsCount): - yield respQueue.get() + for _ in range(threads): + values.put(DONE) + + for _ in xrange(count): + yield results.get() def isAscii(s): -- To view, visit https://gerrit.ovirt.org/39119 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba6116ac4003702c8e921cebaf494491a6f9afaf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 38

Change in vdsm[master]: udevadm: More precise error handling
by Nir Soffer 24 Jul '16

24 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: udevadm: More precise error handling ...................................................................... udevadm: More precise error handling udevadm provides a --timeout option, but there is no robust way to detect a timeout in EL6, EL7, and Fedora 20. In Fedora 21 and upstream, udevadm ignores the timeout option. This patch improves error handling by using our own timeout. udevadm.settle() raises now udevadm.Failure or udevadm.Timeout, and the caller is responsible to handle the error. In both multipath.rescan() and IscsiConnection.connect(), we warn about timeout but do not handle other errors, so real errors in udevadm will fail loudly. Change-Id: Ia0a7380b1b181ec93399ea741122cfa2e98086fb Relates-To: https://bugzilla.redhat.com/1209474 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- A tests/udevadmTests.py M vdsm/storage/multipath.py M vdsm/storage/storageServer.py M vdsm/storage/udevadm.py 4 files changed, 106 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/39740/1 diff --git a/tests/udevadmTests.py b/tests/udevadmTests.py new file mode 100644 index 0000000..90841b2 --- /dev/null +++ b/tests/udevadmTests.py @@ -0,0 +1,52 @@ +# +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + + +from monkeypatch import MonkeyPatch +from testlib import VdsmTestCase + +from vdsm import utils +from storage import udevadm + +TRUE = utils.CommandPath("true", "/bin/true", "/usr/bin/true") +FALSE = utils.CommandPath("false", "/bin/false", "/usr/bin/false") +READ = utils.CommandPath("read", "/bin/read", "/usr/bin/read") + + +class UdevadmSettleTests(VdsmTestCase): + + @MonkeyPatch(udevadm, "_UDEVADM", TRUE) + def test_success(self): + udevadm.settle(5) + + @MonkeyPatch(udevadm, "_UDEVADM", FALSE) + def test_error(self): + try: + udevadm.settle(5) + except udevadm.Failure as e: + self.assertEqual(e.rc, 1) + self.assertEqual(e.out, "") + self.assertEqual(e.err, "") + else: + self.fail("Failure not raised") + + @MonkeyPatch(udevadm, "_UDEVADM", READ) + def test_timeout(self): + self.assertRaises(udevadm.Timeout, udevadm.settle, 1) diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index a1c42b3..925c411 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -73,7 +73,10 @@ # events are processed, ensuring detection of new devices and creation or # update of multipath devices. timeout = config.getint('irs', 'scsi_settle_timeout') - udevadm.settle(timeout) + try: + udevadm.settle(timeout) + except udevadm.Timeout as e: + log.warning("Timeout waiting for udev events: %s", e) def deduceType(a, b): diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 22a90d1..c19fb8d 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -382,7 +382,10 @@ def connect(self): iscsi.addIscsiNode(self._iface, self._target, self._cred) timeout = config.getint("irs", "scsi_settle_timeout") - udevadm.settle(timeout) + try: + udevadm.settle(timeout) + except udevadm.Timeout as e: + self.log.warning("Timeout waiting for udev events: %s", e) def _match(self, session): target = session.target diff --git a/vdsm/storage/udevadm.py b/vdsm/storage/udevadm.py index 4b4b54a..a2afd04 100644 --- a/vdsm/storage/udevadm.py +++ b/vdsm/storage/udevadm.py @@ -18,22 +18,39 @@ # Refer to the README and COPYING files for full details of the license # -import logging +import errno +import signal + from vdsm import utils +from vdsm.infra import zombiereaper _UDEVADM = utils.CommandPath("udevadm", "/sbin/udevadm", "/usr/sbin/udevadm") class Error(Exception): + message = None - def __init__(self, rc, out, err): + def __str__(self): + return self.message.format(self=self) + + +class Failure(Error): + message = ("udevadm failed cmd={self.cmd} rc={self.rc} out={self.out!r} " + "err={self.err!r}") + + def __init__(self, cmd, rc, out, err): + self.cmd = cmd self.rc = rc self.out = out self.err = err - def __str__(self): - return "Process failed with rc=%d out=%r err=%r" % ( - self.rc, self.out, self.err) + +class Timeout(Error): + message = ("udevadm timed out cmd={self.cmd} timeout={self.timeout}") + + def __init__(self, cmd, timeout): + self.cmd = cmd + self.timeout = timeout def settle(timeout, exit_if_exists=None): @@ -44,25 +61,35 @@ Arguments: timeout Maximum number of seconds to wait for the event queue to - become empty. A value of 0 will check if the queue is empty - and always return immediately. + become empty. exit_if_exists Stop waiting if file exists. + + Raises Failure if udevadm failed, or Timeout if udevadm did not terminate + within the requested timeout. """ - args = ["settle", "--timeout=%s" % timeout] + cmd = [_UDEVADM.cmd, "settle"] if exit_if_exists: - args.append("--exit-if-exists=%s" % exit_if_exists) + cmd.append("--exit-if-exists=%s" % exit_if_exists) - try: - _run_command(args) - except Error as e: - logging.error("%s", e) + _run_command(cmd, timeout) -def _run_command(args): - cmd = [_UDEVADM.cmd] - cmd.extend(args) - rc, out, err = utils.execCmd(cmd, raw=True) - if rc != 0: - raise Error(rc, out, err) +def _run_command(cmd, timeout=None): + proc = utils.execCmd(cmd, sync=False, deathSignal=signal.SIGKILL) + + if not proc.wait(timeout): + try: + proc.kill() + except OSError as e: + if e.errno != errno.ESRCH: + raise + finally: + zombiereaper.autoReapPID(proc.pid) + raise Timeout(cmd, timeout) + + if proc.returncode != 0: + out = "".join(proc.stdout) + err = "".join(proc.stderr) + raise Failure(cmd, proc.returncode, out, err) -- To view, visit https://gerrit.ovirt.org/39740 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0a7380b1b181ec93399ea741122cfa2e98086fb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 10

Change in vdsm[master]: monitor: Add udev monitor
by rmohr＠redhat.com 23 Jul '16

23 Jul '16

Roman Mohr has uploaded a new change for review. Change subject: monitor: Add udev monitor ...................................................................... monitor: Add udev monitor Allow easy monitoring of device hotplug and device state changes which are covered by udev. Change-Id: I4b91753424d83896fa538eb6b57f8653b6332fbb Signed-off-by: Roman Mohr <rmohr(a)redhat.com> --- A lib/vdsm/udev/monitor.py M tests/Makefile.am A tests/udevMonitorTests.py M vdsm.spec.in 4 files changed, 272 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/47729/1 diff --git a/lib/vdsm/udev/monitor.py b/lib/vdsm/udev/monitor.py new file mode 100644 index 0000000..8698bf3 --- /dev/null +++ b/lib/vdsm/udev/monitor.py @@ -0,0 +1,133 @@ +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from functools import partial +import logging +import threading +from time import sleep + +from pyudev import Context, Monitor, MonitorObserver + + +class UdevMonitor(object): + + """ + ``udev`` event monitor. Usage: + + The monitor is a thread-save thin wrapper arount pyudev.MonitorObserver. + This allows multiple callbacks for the same netlink socket. To avoid + listening for udev events the application is not interested in, the + monitoring thread only starts listening on the socket when the monitor is + started and at least one subscriber is added. + + The simplest way to use the monitor is to subscribe a callback to a + specific subsystem event and let the callback do the work: + + dev listen_for_disabled_cpu_events(device): + if device.action == 'offline': + print('CPU {0.name} is now offline'.format(device)) + + monitor = UdevMonitor() + monitor.start() + monitor.subscribe(listen_for_disabled_cpu_events, subsystem='cpu') + + Another approach would be to just enqueue the udev event in a queue and do + the actual work in another thread or a thread pool. This is one approach to + do this: + + queue = Queue.Queue() + def new_device_listener(device): + if device.action == 'add': + queue.put(device) + + monitor = UdevMonitor() + monitor.subscribe(new_device_listener, subsystem='usb', + device_type='usb_device') + monitor.start() + """ + + def __init__(self): + self._subsystems = {} + self._context = Context() + self._monitor = Monitor.from_netlink(self._context) + self._observer = MonitorObserver(self._monitor, callback=partial( + UdevMonitor._event_loop, self), name='udev-monitor') + self._filter_lock = threading.Lock() + self._is_started = False + self._can_start = False + + def _event_loop(self, device): + subsystem = self._subsystems[device.subsystem] + for callback in subsystem.get(device.device_type, []): + _execute_callback(callback, device) + if device.device_type: + for callback in subsystem.get(None, []): + _execute_callback(callback, device) + + def subscribe(self, callback, subsystem, device_type=None): + """ + Raise :exc:`~exceptions.ValueError` if the callback is None + + :param callback: function to invoke + :param subsystem: byte or unicode string representing the subsystem to + listen on (e.g. ``'cpu'``, ``'usb'``) + :param device_type: byte or unicode string representing the device type + to listen for changes (e.g. ``'usb_device'``, + ``'block'``) + :return: None + """ + if callback is None: + raise ValueError('callback missing') + with self._filter_lock: + self._monitor.filter_by(subsystem, device_type) + device_types = self._subsystems.get(subsystem, {}) + callbacks = device_types.get(device_type, []) + callbacks.append(callback) + device_types[device_type] = callbacks + self._subsystems[subsystem] = device_types + self._start_if_necessary() + + def start(self): + self._can_start = True + with self._filter_lock: + if self._subsystems: + self._start_if_necessary() + + def _start_if_necessary(self): + if self._can_start and not self._is_started: + self._observer.start() + self._is_started = True + + def stop(self): + """ + Stops the monitoring thread. It is guaranteed that callbacks are no + longer invoked after calling this method. The method can be called + multiple times. + + Note that this only stops the monitoring thread and not the monitor + itself. The monitor stops listening when it is dereferenced. + """ + self._observer.stop() + + +def _execute_callback(callback, device): + try: + callback(device) + except Exception as callbackException: + logging.error( + 'Callback execution threw an exception: %s', callbackException) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1168862..7483d0c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,6 +110,7 @@ testlibTests.py \ toolTests.py \ transportWrapperTests.py \ + udevMonitorTests.py \ utilsTests.py \ vdscliTests.py \ vdsClientTests.py \ diff --git a/tests/udevMonitorTests.py b/tests/udevMonitorTests.py new file mode 100644 index 0000000..2526459 --- /dev/null +++ b/tests/udevMonitorTests.py @@ -0,0 +1,137 @@ +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +from functools import partial + +import Queue + +from nettestlib import Bridge +from testValidation import ValidateRunningAsRoot +from testlib import VdsmTestCase +from vdsm.udev.monitor import UdevMonitor + + +class UdevMonitorTest(VdsmTestCase): + + def setUp(self): + self._queue = Queue.Queue() + self._monitor = UdevMonitor() + self._monitor.start() + + def tearDown(self): + self._monitor.stop() + + @ValidateRunningAsRoot + def testAddDevice(self): + self._monitor.subscribe( + partial(UdevMonitorTest._device_listener, self), + subsystem='net', + device_type='bridge') + bridge = Bridge() + try: + bridge.addDevice() + device = None + try: + device = self._queue.get(timeout=1) + except Queue.Empty: + pass + self.assertIsNotNone(device, + msg='Should have detected an event') + self.assertEqual(device.action, 'add') + finally: + bridge.delDevice() + + @ValidateRunningAsRoot + def testAddDeviceForSubsystem(self): + self._monitor.subscribe( + partial(UdevMonitorTest._device_listener, self), + subsystem='net', + device_type=None) + bridge = Bridge() + try: + bridge.addDevice() + device = None + try: + device = self._queue.get(timeout=1) + except Queue.Empty: + pass + self.assertIsNotNone(device, + msg='Should have detected an event') + self.assertEqual(device.action, 'add') + finally: + bridge.delDevice() + + @ValidateRunningAsRoot + def testRemoveDevice(self): + + bridge = Bridge() + try: + bridge.addDevice() + self._monitor.subscribe( + partial(UdevMonitorTest._device_listener, self), + subsystem='net', + device_type='bridge') + bridge.delDevice() + device = None + try: + device = self._queue.get(timeout=1) + except Queue.Empty: + pass + self.assertIsNotNone(device, + msg='Should have detected an event') + self.assertEqual(device.action, 'remove') + except: + bridge.delDevice() + + @ValidateRunningAsRoot + def testEventSeries(self): + + bridge1 = Bridge() + bridge2 = Bridge() + try: + self._monitor.subscribe( + partial(UdevMonitorTest._device_listener, self), + subsystem='net', + device_type='bridge') + bridge1.addDevice() + bridge1.delDevice() + bridge2.addDevice() + bridge2.delDevice() + events = [] + try: + events.append(self._queue.get(timeout=1)) + events.append(self._queue.get(timeout=1)) + events.append(self._queue.get(timeout=1)) + events.append(self._queue.get(timeout=1)) + except Queue.Empty: + pass + self.assertEqual(len(events), 4) + except: + _delBridge(bridge1) + _delBridge(bridge2) + + def _device_listener(self, device): + self._queue.put(device) + + +def _delBridge(bridge): + try: + bridge.delDevice() + except: + pass diff --git a/vdsm.spec.in b/vdsm.spec.in index 8f758ca..ae5e483 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -126,6 +126,7 @@ Requires: python-pthreading >= 0.1.3-3 Requires: python-six Requires: python-requests +Requires: python-udev >= 0.15 Requires: %{name}-infra = %{version}-%{release} Requires: rpm-python Requires: nfs-utils -- To view, visit https://gerrit.ovirt.org/47729 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b91753424d83896fa538eb6b57f8653b6332fbb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>

4 13

Change in vdsm[master]: FileVolumeMetadata: split getMetadata
by alitke＠redhat.com 20 Jul '16

20 Jul '16

Adam Litke has uploaded a new change for review. Change subject: FileVolumeMetadata: split getMetadata ...................................................................... FileVolumeMetadata: split getMetadata Change-Id: I1d3fb61831de5b50a3e562b80bf38ef15ede254f Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/fileVolume.py 1 file changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/44569/1 diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index 08e3f50..74aa911 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -123,18 +123,10 @@ """ return (self.getVolumePath(),) - def getMetadata(self, metaId=None): - """ - Get Meta data array of key,values lines - """ - if not metaId: - metaId = self.getMetadataId() - - volPath, = metaId - metaPath = self._getMetaVolumePath(volPath) - + @classmethod + def read_metadata(cls, oop, meta_path): try: - f = self.oop.directReadLines(metaPath) + f = oop.directReadLines(meta_path) out = {} for l in f: if l.startswith("EOF"): @@ -145,11 +137,22 @@ out[key.strip()] = value.strip() except Exception as e: - self.log.error(e, exc_info=True) - raise se.VolumeMetadataReadError("%s: %s" % (metaId, e)) + cls.log.error(e, exc_info=True) + raise se.VolumeMetadataReadError("%s: %s" % (meta_path, e)) return out + def getMetadata(self, metaId=None): + """ + Get Meta data array of key,values lines + """ + if not metaId: + metaId = self.getMetadataId() + + volPath, = metaId + metaPath = self._getMetaVolumePath(volPath) + return self.read_metadata(self.oop, metaPath) + def getParentId(self): """ Return parent volume UUID -- To view, visit https://gerrit.ovirt.org/44569 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d3fb61831de5b50a3e562b80bf38ef15ede254f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

2 6

Change in vdsm[master]: VolumeMetadata: move prepare and teardown
by alitke＠redhat.com 20 Jul '16

20 Jul '16

Adam Litke has uploaded a new change for review. Change subject: VolumeMetadata: move prepare and teardown ...................................................................... VolumeMetadata: move prepare and teardown Change-Id: Iba0954ace3b1da5ea9afc41aeb6ea69a729fe29c Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockVolume.py M vdsm/storage/fileVolume.py M vdsm/storage/volume.py 3 files changed, 117 insertions(+), 109 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/44050/1 diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 0168d64..597e7ee 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -74,6 +74,8 @@ volume.VolumeMetadata.__init__(self, repoPath, sdUUID, imgUUID, volUUID) self.metaoff = None + self.lvmActivationNamespace = sd.getNamespace(self.sdUUID, + LVM_ACTIVATION_NAMESPACE) def getMetadataId(self): """ @@ -332,6 +334,49 @@ lvs = lvm.lvsByTag(sdUUID, "%s%s" % (TAG_PREFIX_IMAGE, imgUUID)) return [lv.name for lv in lvs] + @logskip("ResourceManager") + def llPrepare(self, rw=False, setrw=False): + """ + Perform low level volume use preparation + + For the Block Volumes the actual LV activation is wrapped + into lvmActivation resource. It is being initialized by the + storage domain sitting on top of the encapsulating VG. + We just use it here. + """ + if setrw: + self.setrw(rw=rw) + access = rm.LockType.exclusive if rw else rm.LockType.shared + activation = rmanager.acquireResource(self.lvmActivationNamespace, + self.volUUID, access) + activation.autoRelease = False + + @classmethod + def teardown(cls, sdUUID, volUUID, justme=False): + """ + Deactivate volume and release resources. + Volume deactivation occurs as part of resource releasing. + If justme is false, the entire COW chain should be torn down. + """ + cls.log.info("Tearing down volume %s/%s justme %s" + % (sdUUID, volUUID, justme)) + lvmActivationNamespace = sd.getNamespace(sdUUID, + LVM_ACTIVATION_NAMESPACE) + rmanager.releaseResource(lvmActivationNamespace, volUUID) + if not justme: + try: + pvolUUID = _getVolumeTag(sdUUID, volUUID, TAG_PREFIX_PARENT) + except Exception as e: + # If storage not accessible or lvm error occurred + # we will failure to get the parent volume. + # We can live with it and still succeed in volume's teardown. + pvolUUID = volume.BLANK_UUID + cls.log.warn("Failure to get parent of volume %s/%s (%s)" + % (sdUUID, volUUID, e)) + + if pvolUUID != volume.BLANK_UUID: + cls.teardown(sdUUID=sdUUID, volUUID=pvolUUID, justme=False) + class BlockVolume(volume.Volume): """ Actually represents a single volume (i.e. part of virtual disk). @@ -341,8 +386,6 @@ def __init__(self, repoPath, sdUUID, imgUUID, volUUID): md = self.MetadataClass(repoPath, sdUUID, imgUUID, volUUID) volume.Volume.__init__(self, md) - self.lvmActivationNamespace = sd.getNamespace(self.sdUUID, - LVM_ACTIVATION_NAMESPACE) @property def metaoff(self): @@ -609,49 +652,6 @@ def shareVolumeRollback(cls, taskObj, volPath): cls.log.info("Volume rollback for volPath=%s", volPath) utils.rmFile(volPath) - - @logskip("ResourceManager") - def llPrepare(self, rw=False, setrw=False): - """ - Perform low level volume use preparation - - For the Block Volumes the actual LV activation is wrapped - into lvmActivation resource. It is being initialized by the - storage domain sitting on top of the encapsulating VG. - We just use it here. - """ - if setrw: - self.setrw(rw=rw) - access = rm.LockType.exclusive if rw else rm.LockType.shared - activation = rmanager.acquireResource(self.lvmActivationNamespace, - self.volUUID, access) - activation.autoRelease = False - - @classmethod - def teardown(cls, sdUUID, volUUID, justme=False): - """ - Deactivate volume and release resources. - Volume deactivation occurs as part of resource releasing. - If justme is false, the entire COW chain should be torn down. - """ - cls.log.info("Tearing down volume %s/%s justme %s" - % (sdUUID, volUUID, justme)) - lvmActivationNamespace = sd.getNamespace(sdUUID, - LVM_ACTIVATION_NAMESPACE) - rmanager.releaseResource(lvmActivationNamespace, volUUID) - if not justme: - try: - pvolUUID = _getVolumeTag(sdUUID, volUUID, TAG_PREFIX_PARENT) - except Exception as e: - # If storage not accessible or lvm error occurred - # we will failure to get the parent volume. - # We can live with it and still succeed in volume's teardown. - pvolUUID = volume.BLANK_UUID - cls.log.warn("Failure to get parent of volume %s/%s (%s)" - % (sdUUID, volUUID, e)) - - if pvolUUID != volume.BLANK_UUID: - cls.teardown(sdUUID=sdUUID, volUUID=pvolUUID, justme=False) def getVolumeTag(self, tagPrefix): return self.md.getVolumeTag(tagPrefix) diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index 2dad91f..08e3f50 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -337,6 +337,26 @@ volList.append(volid) return volList + def llPrepare(self, rw=False, setrw=False): + """ + Make volume accessible as readonly (internal) or readwrite (leaf) + """ + volPath = self.getVolumePath() + + # Volumes leaves created in 2.2 did not have group writeable bit + # set. We have to set it here if we want qemu-kvm to write to old + # NFS volumes. + self.oop.fileUtils.copyUserModeToGroup(volPath) + + if setrw: + self.setrw(rw=rw) + if rw: + if not self.oop.os.access(volPath, os.R_OK | os.W_OK): + raise se.VolumeAccessError(volPath) + else: + if not self.oop.os.access(volPath, os.R_OK): + raise se.VolumeAccessError(volPath) + class FileVolume(volume.Volume): """ Actually represents a single volume (i.e. part of virtual disk). @@ -488,26 +508,6 @@ procPool.utils.rmFile(volPath) procPool.utils.rmFile(cls.__metaVolumePath(volPath)) procPool.utils.rmFile(cls.MetadataClass._leaseVolumePath(volPath)) - - def llPrepare(self, rw=False, setrw=False): - """ - Make volume accessible as readonly (internal) or readwrite (leaf) - """ - volPath = self.getVolumePath() - - # Volumes leaves created in 2.2 did not have group writeable bit - # set. We have to set it here if we want qemu-kvm to write to old - # NFS volumes. - self.oop.fileUtils.copyUserModeToGroup(volPath) - - if setrw: - self.setrw(rw=rw) - if rw: - if not self.oop.os.access(volPath, os.R_OK | os.W_OK): - raise se.VolumeAccessError(volPath) - else: - if not self.oop.os.access(volPath, os.R_OK): - raise se.VolumeAccessError(volPath) @classmethod def __putMetadata(cls, metaId, meta): diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index a098eb7..22f7ead 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -525,6 +525,56 @@ return apparentSize return req_size + def prepare(self, rw=True, justme=False, + chainrw=False, setrw=False, force=False): + """ + Prepare volume for use by consumer. + If justme is false, the entire COW chain is prepared. + Note: setrw arg may be used only by SPM flows. + """ + self.log.info("Volume: preparing volume %s/%s", + self.sdUUID, self.volUUID) + + if not force: + # Cannot prepare ILLEGAL volume + if not self.isLegal(): + raise se.prepareIllegalVolumeError(self.volUUID) + + if rw and self.isShared(): + if chainrw: + rw = False # Shared cannot be set RW + else: + raise se.SharedVolumeNonWritable(self) + + if (not chainrw and rw and self.isInternal() and setrw and + not self.recheckIfLeaf()): + raise se.InternalVolumeNonWritable(self) + + self.llPrepare(rw=rw, setrw=setrw) + self.updateInvalidatedSize() + + try: + if justme: + return True + pvol = self.produceParent() + if pvol: + pvol.prepare(rw=chainrw, justme=False, + chainrw=chainrw, setrw=setrw) + except Exception: + self.log.error("Unexpected error", exc_info=True) + self.teardown(self.sdUUID, self.volUUID) + raise + + return True + + @classmethod + def teardown(cls, sdUUID, volUUID, justme=False): + """ + Teardown volume. + If justme is false, the entire COW chain is teared down. + """ + pass + class Volume(object): log = logging.getLogger('Storage.Volume') @@ -1091,53 +1141,11 @@ def prepare(self, rw=True, justme=False, chainrw=False, setrw=False, force=False): - """ - Prepare volume for use by consumer. - If justme is false, the entire COW chain is prepared. - Note: setrw arg may be used only by SPM flows. - """ - self.log.info("Volume: preparing volume %s/%s", - self.sdUUID, self.volUUID) - - if not force: - # Cannot prepare ILLEGAL volume - if not self.isLegal(): - raise se.prepareIllegalVolumeError(self.volUUID) - - if rw and self.isShared(): - if chainrw: - rw = False # Shared cannot be set RW - else: - raise se.SharedVolumeNonWritable(self) - - if (not chainrw and rw and self.isInternal() and setrw and - not self.recheckIfLeaf()): - raise se.InternalVolumeNonWritable(self) - - self.llPrepare(rw=rw, setrw=setrw) - self.updateInvalidatedSize() - - try: - if justme: - return True - pvol = self.produceParent() - if pvol: - pvol.prepare(rw=chainrw, justme=False, - chainrw=chainrw, setrw=setrw) - except Exception: - self.log.error("Unexpected error", exc_info=True) - self.teardown(self.sdUUID, self.volUUID) - raise - - return True + return self.md.prepare(rw, justme, chainrw, setrw, force) @classmethod def teardown(cls, sdUUID, volUUID, justme=False): - """ - Teardown volume. - If justme is false, the entire COW chain is teared down. - """ - pass + cls.MetadataClass.teardown(sdUUID, volUUID, justme) @classmethod def newMetadata(cls, metaId, sdUUID, imgUUID, puuid, size, format, type, -- To view, visit https://gerrit.ovirt.org/44050 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba0954ace3b1da5ea9afc41aeb6ea69a729fe29c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

2 7

Change in vdsm[master]: sdc: Allow StorageDomainCache to cache StorageDomainManifest...
by alitke＠redhat.com 20 Jul '16

20 Jul '16

Adam Litke has uploaded a new change for review. Change subject: sdc: Allow StorageDomainCache to cache StorageDomainManifest objects ...................................................................... sdc: Allow StorageDomainCache to cache StorageDomainManifest objects When HSM is operating without SPM the system should always be using StorageDomainManifest objects instead of StorageDomains. With this patch we can instruct the cache to serve the correct type of object without changing all consumers of sdCache. Change-Id: I9a3dc7d9bf24f7d8b60ddff6f5364b65a9354e45 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/sdc.py 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/44041/1 diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py index ecb9708..cbdaed9 100644 --- a/vdsm/storage/sdc.py +++ b/vdsm/storage/sdc.py @@ -64,12 +64,13 @@ STORAGE_STALE = 1 STORAGE_REFRESHING = 2 - def __init__(self, storage_repo): + def __init__(self, storage_repo, use_manifests=False): self._syncroot = threading.Condition() self.__domainCache = {} self.__inProgress = set() self.__staleStatus = self.STORAGE_STALE self.storage_repo = storage_repo + self.use_manifests = use_manifests self.knownSDs = {} # {sdUUID: mod.findDomain} def invalidateStorage(self): @@ -162,12 +163,18 @@ # this changes, please update the order. for mod in (blockSD, glusterSD, localFsSD, nfsSD): try: - return mod.findDomain(sdUUID) + if self.use_manifests: + ret = mod.findDomainManifest(sdUUID) + else: + ret = mod.findDomain(sdUUID) except se.StorageDomainDoesNotExist: pass except Exception: self.log.error("Error while looking for domain `%s`", sdUUID, exc_info=True) + else: + self.log.debug("Found domain %s", ret) + return ret raise se.StorageDomainDoesNotExist(sdUUID) @@ -181,10 +188,12 @@ return uuids - def refresh(self): + def refresh(self, use_manifests=None): with self._syncroot: lvm.invalidateCache() self.__domainCache.clear() + if use_manifests is not None: + self.use_manifests = use_manifests def manuallyAddDomain(self, domain): with self._syncroot: -- To view, visit https://gerrit.ovirt.org/44041 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a3dc7d9bf24f7d8b60ddff6f5364b65a9354e45 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

2 7

Change in vdsm[master]: VolumeMetadata: Move getParentVolume
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: VolumeMetadata: Move getParentVolume ...................................................................... VolumeMetadata: Move getParentVolume Move getParentVolume into VolumeMetadata. If HSM configured sdCache to return StorageDomainManifest objects then this will return VolumeMetadata objects. Otherwise it will continue to return Volume objects as it always has. Change-Id: I74def8861e0b7b97ca4d218a969440ccba7f07dd Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/volume.py 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/44042/1 diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index c40ba77..f7e5bc0 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -485,6 +485,16 @@ """ pass # Do not remove this method or the V3 upgrade will fail. + def getParentVolume(self): + """ + Return parent volume object + """ + puuid = self.getParent() + if puuid and puuid != BLANK_UUID: + return sdCache.produce(self.sdUUID).produceVolume(self.imgUUID, + puuid) + return None + class Volume(object): log = logging.getLogger('Storage.Volume') @@ -1128,11 +1138,7 @@ """ Return parent volume object """ - puuid = self.getParent() - if puuid and puuid != BLANK_UUID: - return sdCache.produce(self.sdUUID).produceVolume(self.imgUUID, - puuid) - return None + return self.md.getParentVolume() def setParent(self, puuid): """ -- To view, visit https://gerrit.ovirt.org/44042 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74def8861e0b7b97ca4d218a969440ccba7f07dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 7

Change in vdsm[master]: storage: Make Image.__chainSizeCalc public
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: storage: Make Image.__chainSizeCalc public ...................................................................... storage: Make Image.__chainSizeCalc public The new SDM copyVolumeData wants to make use of the same logic being used by the classic copy flows to extend the size of the target volume to the appropriate size. Make Image.__chainSizeCalc public so it can be accessed from the SDM code. Change-Id: Id079eb5067c16f934370e42b5f4e09bbcef1512b Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/image.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/38995/1 diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 791b48c..8d5e8c2 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -140,7 +140,7 @@ randomStr = misc.randomStr(RENAME_RANDOM_STRING_LEN) return "%s%s_%s" % (sd.REMOVED_IMAGE_PREFIX, randomStr, uuid) - def __chainSizeCalc(self, sdUUID, imgUUID, volUUID, size): + def chainSizeCalc(self, sdUUID, imgUUID, volUUID, size): """ Compute an estimate of the whole chain size using the sum of the actual size of the chain's volumes @@ -763,7 +763,7 @@ if volParams['volFormat'] != volume.COW_FORMAT or \ volParams['prealloc'] != volume.SPARSE_VOL: raise se.IncorrectFormat(self) - volParams['apparentsize'] = self.__chainSizeCalc( + volParams['apparentsize'] = self.chainSizeCalc( sdUUID, srcImgUUID, srcVolUUID, volParams['size']) # Find out dest volume parameters -- To view, visit https://gerrit.ovirt.org/38995 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id079eb5067c16f934370e42b5f4e09bbcef1512b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

6 34

Change in vdsm[master]: SDM: Add extendVolumeContainer API
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: SDM: Add extendVolumeContainer API ...................................................................... SDM: Add extendVolumeContainer API The extendVolumeContainer API is used to extend LVM logical volumes which store thinly-provisioned vdsm volumes. Change-Id: I6a128ba3eab4116ff4e794e94a171e51d9e432de Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/hsm.py M vdsm/storage/sdm/__init__.py M vdsm/storage/sdm/blockstore.py M vdsm/storage/sdm/filestore.py 8 files changed, 123 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/39696/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 23bfc1a..f6c0c83 100755 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1953,6 +1953,17 @@ else: return status['status']['code'], status['status']['message'] + def extendVolumeContainer(self, args): + if len(args) != 4: + raise ValueError("Wrong number of arguments") + + sdUUID, imgUUID, volUUID, size = args + status = self.s.extendVolumeContainer(sdUUID, imgUUID, volUUID, size) + if status['status']['code'] == 0: + return 0, '' + else: + return status['status']['code'], status['status']['message'] + if __name__ == '__main__': if _glusterEnabled: @@ -2844,6 +2855,11 @@ '<srcImage> <dstImage> <collapse>', 'Copy the date from one volume into another.' )), + 'extendVolumeContainer': ( + serv.extendVolumeContainer, ( + '<sdUUID> <imgUUID> <volUUID>', + 'Extend a thinly-provisioned block volume.' + )), } if _glusterEnabled: commands.update(ge.getGlusterCmdDict(serv)) diff --git a/vdsm/API.py b/vdsm/API.py index b4b7308..5661b82 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1675,6 +1675,10 @@ def copyData(self, srcImage, dstImage, collapse): return self._cif.irs.copyData(srcImage, dstImage, collapse) + def extendVolumeContainer(self, sdUUID, imgUUID, volUUID, size): + return self._cif.irs.extendVolumeContainer(sdUUID, imgUUID, volUUID, + size) + # take a rough estimate on how much free mem is available for new vm # memTotal = memFree + memCached + mem_used_by_non_qemu + resident . # simply returning (memFree + memCached) is not good enough, as the diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index 3e70e28..ae43614 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -993,6 +993,10 @@ api = API.Global() return api.copyData(srcImage, dstImage, collapse) + def extendVolumeContainer(self, sdUUID, imgUUID, volUUID, size): + api = API.Global() + return api.extendVolumeContainer(sdUUID, imgUUID, volUUID, size) + def getGlobalMethods(self): return ((self.vmDestroy, 'destroy'), (self.vmCreate, 'create'), @@ -1143,7 +1147,8 @@ 'storageServer_ConnectionRefs_statuses'), (self.volumeCreateContainer, 'createVolumeContainer'), (self.volumeRemove, 'removeVolume'), - (self.copyData, 'copyData')) + (self.copyData, 'copyData'), + (self.extendVolumeContainer, 'extendVolumeContainer')) def wrapApiMethod(f): diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 8720703..f507324 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -4182,6 +4182,24 @@ 'data': {'srcImage': 'VolumeSpec', 'dstImage': 'VolumeSpec', 'collapse': 'bool'}} +## +# @Host.extendVolumeContainer: +# +# Extend a thinly-provisioned volume. +# +# @sdUUID: The UUID of the storage domain containing the volume +# +# @imgUUID: The UUID of the image containing the volume +# +# @volUUID: The UUID of the volume +# +# @size: The new desired size (in bytes) +# +# Since: 4.18.0 +## +{'command': {'class': 'Host', 'name': 'extendVolumeContainer'}, + 'data': {'sdUUID': 'UUID', 'imgUUID': 'UUID', 'volUUID': 'UUID', + 'size': 'uint'}} ## Category: @ConnectionRefs ################################################## ## diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 2236457..34730dd 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -854,13 +854,22 @@ """ newSize = misc.validateN(newSize, "newSize") / 2 ** 20 - try: - pool = self.getPool(spUUID) - except se.StoragePoolUnknown: - pass + enableSDM = True # Replace this with a check on the SD version + if enableSDM: + domain = sdCache.produce(volDict['domainID']) + self._sdmSchedule('extendVolumeContainer', + sdm.extendVolumeContainer, domain, + volDict['imageID'], volDict['volumeID'], newSize, + callbackFunc, volDict) else: - if pool.hsmMailer: - pool.hsmMailer.sendExtendMsg(volDict, newSize, callbackFunc) + try: + pool = self.getPool(spUUID) + except se.StoragePoolUnknown: + pass + else: + if pool.hsmMailer: + pool.hsmMailer.sendExtendMsg(volDict, newSize, + callbackFunc) def _spmSchedule(self, spUUID, name, func, *args): self.validateSPM(spUUID) @@ -3744,3 +3753,18 @@ se.VolumeCopyError("Unsupported combination of image types: " "src:%s, dst:%s" % (src.get('type'), dst.get('type'))) + + @public + def extendVolumeContainer(self, sdUUID, imgUUID, volUUID, size): + vars.task.setDefaultException( + se.VolumeExtendingError("sdUUID=%s, volumeUUID=%s, size=%s" % ( + sdUUID, volUUID, size))) + size = misc.validateN(size, "size") + # ExtendVolume expects size in MB + size = math.ceil(size / 2 ** 20) + + dom = sdCache.produce(sdUUID=sdUUID) + misc.validateUUID(imgUUID, 'imgUUID') + misc.validateUUID(volUUID, 'volUUID') + vars.task.getSharedLock(STORAGE, sdUUID) + return sdm.extendVolumeContainer(dom, imgUUID, volUUID, size) diff --git a/vdsm/storage/sdm/__init__.py b/vdsm/storage/sdm/__init__.py index 9d74bd5..7f80ca2 100644 --- a/vdsm/storage/sdm/__init__.py +++ b/vdsm/storage/sdm/__init__.py @@ -195,3 +195,16 @@ finally: dstDom.releaseVolumeLease(dstImage['imgUUID'], dstImage['volUUID']) srcDom.releaseVolumeLease(srcImage['imgUUID'], srcImage['volUUID']) + + +def extendVolumeContainer(domain, imgUUID, volUUID, size, + cbFn=None, cbData=None): + cls = __getStoreClass(domain) + hostId = getDomainHostId(domain.sdUUID) + domain.acquireClusterLock(hostId) + try: + cls.extendVolume(domain, imgUUID, volUUID, size) + finally: + domain.releaseClusterLock() + if cbFn: + cbFn(cbData) diff --git a/vdsm/storage/sdm/blockstore.py b/vdsm/storage/sdm/blockstore.py index b80f869..73a12a8 100644 --- a/vdsm/storage/sdm/blockstore.py +++ b/vdsm/storage/sdm/blockstore.py @@ -20,6 +20,7 @@ import os import logging +import math import vdsm.utils as utils from vdsm.config import config @@ -27,9 +28,13 @@ import volumestore from .. import blockVolume from .. import lvm +from .. import resourceManager as rm +from .. import sd from .. import storage_exception as se from .. import volume +from ..resourceFactories import IMAGE_NAMESPACE +rmanager = rm.ResourceManager.getInstance() log = logging.getLogger('Storage.sdm.blockstore') SECTORS_TO_MB = (1 << 20) / volume.BLOCK_SIZE @@ -37,6 +42,9 @@ class BlockStore(volumestore.VolumeStore): volClass = blockVolume.BlockVolume + + # Estimate of the additional space needed for qcow format internal data. + VOLWM_COW_OVERHEAD = 1.1 @classmethod def volFormatToPreallocate(cls, volFormat): @@ -109,7 +117,7 @@ parent = tag[len(blockVolume.TAG_PREFIX_PARENT):] if parent and image: break - vols.append(volumestore.GCVol(lv.name, volUUID, image, parent)) + vols.append(volumestore.GCVol(lv.name, volUUID, image, parent) return vols @classmethod @@ -119,3 +127,24 @@ except se.VolumeMetadataReadError: pass lvm.removeLVs(dom.sdUUID, volName) + + @classmethod + def extendVolume(cls, dom, imgUUID, volUUID, size): + imageResourcesNamespace = sd.getNamespace(dom.sdUUID, IMAGE_NAMESPACE) + with rmanager.acquireResource(imageResourcesNamespace, imgUUID, + rm.LockType.shared): + # Verify that the requested size is valid + vol = dom.produceVolume(imgUUID, volUUID) + volInfo = vol.getInfo() + maxSize = int(volInfo['capacity']) + if volInfo['format'] == volume.type2name(volume.COW_FORMAT): + maxSize = maxSize * cls.VOLWM_COW_OVERHEAD + maxSize = math.ceil(maxSize / 2 ** 20) + if size > maxSize: + raise se.VolumeExtendingError( + "Size %i exceeds the maximum extend size of %i for volume " + "%s" % (size, maxSize, volUUID)) + + dom.extendVolume(volUUID, size) + + diff --git a/vdsm/storage/sdm/filestore.py b/vdsm/storage/sdm/filestore.py index dd6c58f..cc3e2bb 100644 --- a/vdsm/storage/sdm/filestore.py +++ b/vdsm/storage/sdm/filestore.py @@ -157,4 +157,9 @@ except se.ImageDeleteError: dom.imageGarbageCollector() else: - dom.oop.os.unlink(volPath) \ No newline at end of file + dom.oop.os.unlink(volPath) + + @classmethod + def extendVolume(cls, dom, imgUUID, volUUID, size): + # There is nothing to do for file domains. The filesystem handles it, + pass -- To view, visit https://gerrit.ovirt.org/39696 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a128ba3eab4116ff4e794e94a171e51d9e432de Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 16

Change in vdsm[master]: SDM: isolateVolumes API
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: SDM: isolateVolumes API ...................................................................... SDM: isolateVolumes API Change-Id: I9b67e2df82afba9956e8246c1a4f9093aed729f2 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/hsm.py M vdsm/storage/sdm/__init__.py M vdsm/storage/sdm/blockstore.py M vdsm/storage/sdm/filestore.py M vdsm/storage/sdm/volumestore.py M vdsm/storage/storage_exception.py 10 files changed, 134 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/40379/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 633d1b7..d3c482e 100755 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1963,6 +1963,17 @@ else: return status['status']['code'], status['status']['message'] + def isolateVolumes(self, args): + if len(args) != 4: + raise ValueError('Wrong number of arguments') + sdUUID, srcImgUUID, dstImgUUID, volStr = args + volList = volStr.split(',') + status = self.s.isolateVolumes(sdUUID, srcImgUUID, dstImgUUID, volList) + if status['status']['code'] == 0: + return 0, '' + else: + return status['status']['code'], status['status']['message'] + if __name__ == '__main__': if _glusterEnabled: @@ -2855,6 +2866,12 @@ '<sdUUID> <imgUUID> <volUUID>', 'Extend a thinly-provisioned block volume.' )), + 'isolateVolumes': ( + serv.isolateVolumes, ( + '<sdUUID> <srcImgUUID> <dstImgUUID> <volUUID>[...,<volUUID>]', + 'Isolate volumes from one image into a new image for ' + 'post-processing.' + )), } if _glusterEnabled: commands.update(ge.getGlusterCmdDict(serv)) diff --git a/vdsm/API.py b/vdsm/API.py index a50025f..44dddb4 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1049,6 +1049,10 @@ def validate(self): return self._irs.validateStorageDomain(self._UUID) + def isolateVolumes(self, srcImageID, dstImageID, volumeList): + return self._irs.isolateVolumes(self._UUID, srcImageID, dstImageID, + volumeList) + class StoragePool(APIBase): ctorArgs = ['storagepoolID'] diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index 7834e83..0e1e5e4 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -1000,6 +1000,10 @@ api = API.Global() return api.extendVolumeContainer(sdUUID, imgUUID, volUUID, size) + def isolateVolumes(self, sdUUID, srcImgUUID, dstImgUUID, volumeList): + api = API.StorageDomain(sdUUID) + return api.isolateVolumes(srcImgUUID, dstImgUUID, volumeList) + def getGlobalMethods(self): return ((self.vmDestroy, 'destroy'), (self.vmCreate, 'create'), @@ -1151,7 +1155,8 @@ 'storageServer_ConnectionRefs_statuses'), (self.volumeCreateContainer, 'createVolumeContainer'), (self.copyData, 'copyData'), - (self.extendVolumeContainer, 'extendVolumeContainer')) + (self.extendVolumeContainer, 'extendVolumeContainer'), + (self.isolateVolumes, 'isolateVolumes')) def wrapApiMethod(f): diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index c0d8caf..a873d22 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -5459,6 +5459,25 @@ {'command': {'class': 'StorageDomain', 'name': 'validate'}, 'data': {'storagedomainID': 'UUID'}} +## +# @StorageDomain.isolateVolumes: +# +# Isolate volumes from one image into a new image. +# +# @storagedomainID: The UUID of the Storage Domain +# +# @srcImageID: The UUID of the Image containing the volumes +# +# @dstImageID: The UUID of the destination Image +# +# @volumeList: Identifies a set of volumes to move +# +# Since: 4.18.0 +## +{'command': {'class': 'StorageDomain', 'name': 'isolateVolumes'}, + 'data': {'storagedomainID': 'UUID', 'srcImageID': 'UUID', + 'dstImageID': 'UUID', 'volumeList': ['UUID']}} + ## Category: @StoragePool ##################################################### ## # @StoragePool: diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 63c9b3b..746423d 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3760,3 +3760,13 @@ misc.validateUUID(volUUID, 'volUUID') vars.task.getSharedLock(STORAGE, sdUUID) return sdm.extendVolumeContainer(dom, imgUUID, volUUID, size) + + @public + def isolateVolumes(self, sdUUID, srcImgUUID, dstImgUUID, volumeList): + vars.task.setDefaultException( + se.IsolateVolumesError(sdUUID, srcImgUUID, dstImgUUID, volumeList)) + dom = sdCache.produce(sdUUID=sdUUID) + misc.validateUUID(srcImgUUID, 'srcImgUUID') + misc.validateUUID(dstImgUUID, 'dstImgUUID') + vars.task.getSharedLock(STORAGE, sdUUID) + return sdm.isolateVolumes(dom, srcImgUUID, dstImgUUID, volumeList) diff --git a/vdsm/storage/sdm/__init__.py b/vdsm/storage/sdm/__init__.py index da1e858..1636e63 100644 --- a/vdsm/storage/sdm/__init__.py +++ b/vdsm/storage/sdm/__init__.py @@ -208,3 +208,21 @@ domain.releaseClusterLock() if cbFn: cbFn(cbData) + + +def isolateVolumes(domain, srcImgUUID, dstImgUUID, volumeList): + cls = __getStoreClass(domain) + imageResourcesNamespace = sd.getNamespace(domain.sdUUID, IMAGE_NAMESPACE) + + hostId = getDomainHostId(domain.sdUUID) + domain.acquireClusterLock(hostId) + try: + with nested(rmanager.acquireResource(imageResourcesNamespace, + srcImgUUID, + rm.LockType.exclusive), + rmanager.acquireResource(imageResourcesNamespace, + dstImgUUID, + rm.LockType.exclusive)): + cls.isolateVolumes(domain, srcImgUUID, dstImgUUID, volumeList) + finally: + domain.releaseClusterLock() diff --git a/vdsm/storage/sdm/blockstore.py b/vdsm/storage/sdm/blockstore.py index 06a77e4..bd9d3f1 100644 --- a/vdsm/storage/sdm/blockstore.py +++ b/vdsm/storage/sdm/blockstore.py @@ -101,6 +101,18 @@ return newName @classmethod + def _isolateVolume(cls, dom, srcImgUUID, dstImgUUID, vol): + pVolUUID = vol.getParent() + toAdd = [blockVolume.TAG_PREFIX_PARENT + volume.BLANK_UUID, + blockVolume.TAG_PREFIX_IMAGE + dstImgUUID] + toDel = [blockVolume.TAG_PREFIX_PARENT + pVolUUID, + blockVolume.TAG_PREFIX_IMAGE + srcImgUUID] + lvm.changeLVTags(dom.sdUUID, vol.volUUID, addTags=toAdd, delTags=toDel) + if pVolUUID and pVolUUID != volume.BLANK_UUID: + pVol = dom.produceVolume(srcImgUUID, pVolUUID) + cls.recheckIfLeaf(pVol) + + @classmethod def _getGCVolumes(cls, dom, onlyImg, onlyVol): lvs = lvm.getLV(dom.sdUUID) vols = [] diff --git a/vdsm/storage/sdm/filestore.py b/vdsm/storage/sdm/filestore.py index 3e99ee9..9385d87 100644 --- a/vdsm/storage/sdm/filestore.py +++ b/vdsm/storage/sdm/filestore.py @@ -98,6 +98,21 @@ return newName @classmethod + def _isolateVolume(cls, dom, srcImgUUID, dstImgUUID, vol): + srcImgPath = os.path.join(dom.getRepoPath(), dom.sdUUID, + sd.DOMAIN_IMAGES, srcImgUUID) + dstImgPath = os.path.join(dom.getRepoPath(), dom.sdUUID, + sd.DOMAIN_IMAGES, dstImgUUID) + pUUID = vol.getParent() + vol._share(dstImgPath) + dstVol = dom.produceVolume(dstImgUUID, vol.volUUID) + dstVol.setParent(volume.BLANK_UUID) + dstVol.setImage(dstImgUUID) + newName = cls._beginRemoveVolume(dom, srcImgPath, vol.volUUID) + volInfo = volumestore.GCVol(newName, vol.volUUID, srcImgUUID, pUUID) + cls._garbageCollectVolume(dom, volInfo) + + @classmethod def _getGCVolumes(cls, dom, onlyImg, onlyVol): vols = [] volPaths = [] diff --git a/vdsm/storage/sdm/volumestore.py b/vdsm/storage/sdm/volumestore.py index d518f20..6568d75 100644 --- a/vdsm/storage/sdm/volumestore.py +++ b/vdsm/storage/sdm/volumestore.py @@ -355,3 +355,27 @@ newName = cls._beginRemoveVolume(dom, imageDir, volUUID) volInfo = GCVol(newName, volUUID, imgUUID, pUUID) cls._garbageCollectVolume(dom, volInfo) + + @classmethod + def isolateVolumes(cls, dom, srcImgUUID, dstImgUUID, volumeList): + repoPath = dom.getRepoPath() + # Create dest image + cls.createImage(repoPath, dom.sdUUID, dstImgUUID) + # Verify dest image contains only volumes in volumeList + uuidList = cls.volClass.getImageVolumes(repoPath, dom.sdUUID, + dstImgUUID) + extraVols = set(uuidList) - set(volumeList) + if extraVols: + log.error("Destination image contains unexpected volumes: %s", + extraVols) + raise se.IsolateVolumesError(dom.sdUUID, srcImgUUID, + dstImgUUID, volumeList) + # Iterate over volumes in volumeList + for volUUID in volumeList: + try: + vol = cls.volClass(repoPath, dom.sdUUID, srcImgUUID, volUUID) + except se.VolumeDoesNotExist: + log.debug("Skipping non-existent source volume %s", volUUID) + continue + vol.validateDelete() + cls._isolateVolume(dom, srcImgUUID, dstImgUUID, vol) diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py index 1cfc8e4..a695cf4 100644 --- a/vdsm/storage/storage_exception.py +++ b/vdsm/storage/storage_exception.py @@ -453,6 +453,15 @@ message = "Image does not exist in domain" +class IsolateVolumesError(StorageException): + def __init__(self, sdUUID, srcImgUUID, dstImgUUID, volumeList): + self.value = ("domain=%s srcImg=%s dstImg=%s " + "volumes=%s" % (sdUUID, srcImgUUID, dstImgUUID, + volumeList)) + code = 269 + message = "Unable to isolate volumes" + + ################################################# # Pool Exceptions ################################################# -- To view, visit https://gerrit.ovirt.org/40379 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b67e2df82afba9956e8246c1a4f9093aed729f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 8

Change in vdsm[master]: HACK: run GC in domain monitor
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: HACK: run GC in domain monitor ...................................................................... HACK: run GC in domain monitor Change-Id: I3c560e6fbccdf50b135cc9c90b23824ae04b0376 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/monitor.py M vdsm/storage/sdm/__init__.py 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/40380/1 diff --git a/vdsm/storage/monitor.py b/vdsm/storage/monitor.py index ef032a5..a2a1bd7 100644 --- a/vdsm/storage/monitor.py +++ b/vdsm/storage/monitor.py @@ -28,6 +28,7 @@ from . import clusterlock from . import misc +from . import sdm from .sdc import sdCache @@ -249,6 +250,7 @@ self._performDomainSelftest() self._checkReadDelay() self._collectStatistics() + self._garbageCollect() except Exception as e: self.log.exception("Error monitoring domain %s", self.sdUUID) self.nextStatus.error = e @@ -340,6 +342,14 @@ self.nextStatus.isoPrefix = self.isoPrefix self.nextStatus.version = self.domain.getVersion() + def _garbageCollect(self): + if True: # XXX: limit this to domain ver 4 or later + try: + sdm.garbageCollectStorageDomain(self.domain) + except: + self.log.exception("Garbage collection failed for domain %s", + self.domain.sdUUID) + # Managing host id def _shouldAcquireHostId(self): diff --git a/vdsm/storage/sdm/__init__.py b/vdsm/storage/sdm/__init__.py index 1636e63..4a31332 100644 --- a/vdsm/storage/sdm/__init__.py +++ b/vdsm/storage/sdm/__init__.py @@ -226,3 +226,15 @@ cls.isolateVolumes(domain, srcImgUUID, dstImgUUID, volumeList) finally: domain.releaseClusterLock() + + +def garbageCollectStorageDomain(domain): + if domain.isISO(): + return + cls = __getStoreClass(domain) + hostId = getDomainHostId(domain.sdUUID) + domain.acquireClusterLock(hostId) + try: + cls.garbageCollectStorageDomain(domain) + finally: + domain.releaseClusterLock() -- To view, visit https://gerrit.ovirt.org/40380 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c560e6fbccdf50b135cc9c90b23824ae04b0376 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

4 9

Change in vdsm[master]: Add wipeVolume API
by alitke＠redhat.com 09 Jul '16

09 Jul '16

Adam Litke has uploaded a new change for review. Change subject: Add wipeVolume API ...................................................................... Add wipeVolume API Change-Id: I572099e1fee4ae847de95e27973405ba90b56a9b Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/hsm.py M vdsm/storage/sdm/__init__.py 6 files changed, 70 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/40628/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index bac146e..c267b75 100755 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1973,6 +1973,16 @@ else: return status['status']['code'], status['status']['message'] + def wipeVolume(self, args): + if len(args) != 3: + raise ValueError('Wrong number of arguments') + sdUUID, imgUUID, volUUID = args + status = self.s.wipeVolume(sdUUID, imgUUID, volUUID) + if status['status']['code'] == 0: + return 0, '' + else: + return status['status']['code'], status['status']['message'] + if __name__ == '__main__': if _glusterEnabled: diff --git a/vdsm/API.py b/vdsm/API.py index 6adefa8..a49448b 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -840,6 +840,9 @@ return self._irs.setVolumeLegality(self._sdUUID, self._spUUID, self._imgUUID, self._UUID, legality) + def wipe(self): + return self._irs.wipeVolume(self._sdUUID, self._imgUUID, self._UUID) + class Image(APIBase): ctorArgs = ['imageID', 'storagepoolID', 'storagedomainID'] diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index f110468..270f7a1 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -1004,6 +1004,10 @@ api = API.StorageDomain(sdUUID) return api.isolateVolume(srcImgUUID, dstImgUUID, volumeID) + def wipeVolume(self, sdUUID, imgUUID, volUUID): + volume = API.Volume(volUUID, None, sdUUID, imgUUID) + return volume.wipe() + def getGlobalMethods(self): return ((self.vmDestroy, 'destroy'), (self.vmCreate, 'create'), @@ -1156,7 +1160,8 @@ (self.volumeCreateContainer, 'createVolumeContainer'), (self.copyData, 'copyData'), (self.extendVolumeContainer, 'extendVolumeContainer'), - (self.isolateVolume, 'isolateVolume')) + (self.isolateVolume, 'isolateVolume'), + (self.wipeVolume, 'wipeVolume')) def wrapApiMethod(f): diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index a76db8d..80b1968 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -8312,6 +8312,22 @@ 'legality': 'VolumeLegality'}} ## +# @Volume.wipe: +# +# Wipe a volume to ensure previous data is erased. +# +# @volumeID: The UUID of the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# Since: 4.18.0 +## +{'command': {'class': 'Volume', 'name': 'wipe'}, + 'data': {'volumeID': 'UUID', 'storagedomainID': 'UUID', 'imageID': 'UUID'}} + +## # @VM.setNumberOfCpus: # # Set the number CPUs for a VM diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 432c8f9..cb51cd1 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3776,3 +3776,16 @@ misc.validateUUID(dstImgUUID, 'dstImgUUID') vars.task.getSharedLock(STORAGE, sdUUID) return sdm.isolateVolume(dom, srcImgUUID, dstImgUUID, volumeID) + + @public + def wipeVolume(self, sdUUID, imgUUID, volUUID): + argsStr = ("sdUUID=%s, imgUUID=%s, volUUID=%s" % + (sdUUID, imgUUID, volUUID)) + vars.task.setDefaultException(se.VolumesZeroingError(argsStr)) + misc.validateUUID(imgUUID, 'imgUUID') + misc.validateUUID(volUUID, 'volUUID') + vars.task.getSharedLock(STORAGE, sdUUID) + imageSpec = {'sdUUID': sdUUID, 'imgUUID': imgUUID, 'volUUID': volUUID} + with sdm.prepareCopy(imageSpec, False, 0, True): + self._sdmSchedule('wipeVolume', sdm.wipeVolume, sdUUID, imgUUID, + volUUID) diff --git a/vdsm/storage/sdm/__init__.py b/vdsm/storage/sdm/__init__.py index 4738813..2113d26 100644 --- a/vdsm/storage/sdm/__init__.py +++ b/vdsm/storage/sdm/__init__.py @@ -22,6 +22,7 @@ from contextlib import contextmanager, nested from .. import image +from .. import misc from .. import resourceManager as rm from .. import sd from .. import storage_exception as se @@ -234,6 +235,27 @@ domain.releaseClusterLock() +def wipeVolume(sdUUID, imgUUID, volUUID): + dom = sdCache.produce(sdUUID) + imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE) + try: + with rmanager.acquireResource(imageResourcesNamespace, + imgUUID, rm.LockType.exclusive): + vol = dom.produceVolume(imgUUID, volUUID) + size = vol.getVolumeSize(bs=1) + vol_path = vol.getVolumePath() + vol.prepare(rw=True, justme=True) + try: + vol.setLegality(volume.ILLEGAL_VOL) + misc.ddWatchCopy( + "/dev/zero", vol_path, vars.task.aborting, int(size)) + finally: + vol.tearDown(imgUUID, volUUID) + vol.setLegality(volume.LEGAL_VOL) + finally: + dom.releaseVolumeLease(imgUUID, volUUID) + + def garbageCollectStorageDomain(domain): if domain.isISO(): return -- To view, visit https://gerrit.ovirt.org/40628 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I572099e1fee4ae847de95e27973405ba90b56a9b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 4

Change in vdsm[master]: api: support multiple 'ipv6addrs' per network and deprecate ...
by osvoboda＠redhat.com 09 Jul '16

09 Jul '16

Ondřej Svoboda has uploaded a new change for review. Change subject: api: support multiple 'ipv6addrs' per network and deprecate 'ipv6addr' ...................................................................... api: support multiple 'ipv6addrs' per network and deprecate 'ipv6addr' Next, the 'ipv6' hook will be extended to understand a whitespace-separated list of IPv6 addresses and also testStaticNetworkConfig will learn to pass multiple IPv6 addresses to VDSM. IPv4 support is planned but needs discussion (should we accept netmasks or just CIDR notation?). Change-Id: I8d16083781919fe5e5d9c75e9dd4ab744afe45be Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M vdsm/network/api.py M vdsm/network/configurators/ifcfg.py M vdsm/network/configurators/iproute2.py M vdsm/network/configurators/pyroute_two.py M vdsm/network/models.py 5 files changed, 45 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/39307/1 diff --git a/vdsm/network/api.py b/vdsm/network/api.py index de92fbf..096f89f 100755 --- a/vdsm/network/api.py +++ b/vdsm/network/api.py @@ -82,7 +82,7 @@ def _objectivizeNetwork(bridge=None, vlan=None, bonding=None, bondingOptions=None, nics=None, mtu=None, ipaddr=None, netmask=None, gateway=None, bootproto=None, - ipv6addr=None, ipv6gateway=None, ipv6autoconf=None, + ipv6addrs=None, ipv6gateway=None, ipv6autoconf=None, dhcpv6=None, defaultRoute=None, _netinfo=None, configurator=None, blockingdhcp=None, implicitBonding=None, opts=None): @@ -100,7 +100,7 @@ :param netmask: IPv4 mask in dotted decimal format. :param gateway: IPv4 address in dotted decimal format. :param bootproto: protocol for getting IP config for the net, e.g., 'dhcp' - :param ipv6addr: IPv6 address in format address[/prefixlen]. + :param ipv6addrs: list of IPv6 addresses in the format address[/prefixlen] :param ipv6gateway: IPv6 address in format address[/prefixlen]. :param ipv6autoconf: whether to use IPv6's stateless autoconfiguration. :param dhcpv6: whether to use DHCPv6. @@ -162,7 +162,7 @@ raise ConfigNetworkError(ne.ERR_BAD_PARAMS, 'Network defined without ' 'devices.') ipv4 = IPv4(ipaddr, netmask, gateway, defaultRoute) - ipv6 = IPv6(ipv6addr, ipv6gateway, defaultRoute) + ipv6 = IPv6(ipv6addrs, ipv6gateway, defaultRoute) blockingdhcp = configurator._inRollback or utils.tobool(blockingdhcp) topNetDev.ipconfig = IpConfig( ipv4=ipv4, ipv6=ipv6, bootproto=bootproto, blockingdhcp=blockingdhcp, @@ -249,6 +249,7 @@ @_alterRunningConfig def _addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask=None, prefix=None, mtu=None, gateway=None, dhcpv6=None, + ipv6addrs=None, ipv6addr=None, ipv6gateway=None, ipv6autoconf=None, force=False, configurator=None, bondingOptions=None, bridged=True, _netinfo=None, hostQos=None, @@ -279,6 +280,12 @@ except ValueError as ve: raise ConfigNetworkError(ne.ERR_BAD_ADDR, "Bad prefix: %s" % ve) + if ipv6addr: + if ipv6addrs: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'Both ipv6addrs and ipv6addr supplied') + else: + ipv6addrs = [ipv6addr] if not utils.tobool(force): logging.debug('validating network...') @@ -312,7 +319,8 @@ bridge=network if bridged else None, vlan=vlan, bonding=bonding, bondingOptions=bondingOptions, nics=nics, mtu=mtu, ipaddr=ipaddr, netmask=netmask, gateway=gateway, bootproto=bootproto, dhcpv6=dhcpv6, - blockingdhcp=blockingdhcp, ipv6addr=ipv6addr, ipv6gateway=ipv6gateway, + blockingdhcp=blockingdhcp, ipv6addrs=ipv6addrs, + ipv6gateway=ipv6gateway, ipv6autoconf=ipv6autoconf, defaultRoute=defaultRoute, _netinfo=_netinfo, configurator=configurator, opts=options) @@ -783,7 +791,8 @@ netmask="<ipv4>" gateway="<ipv4>" bootproto="..." - ipv6addr="<ipv6>[/<prefixlen>]" + ipv6addrs=["<ipv6>[/<prefixlen>]", ...] + ipv6addr="<ipv6>[/<prefixlen>]" (deprecated) ipv6gateway="<ipv6>" ipv6autoconf="0|1" dhcpv6="0|1" diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index 866ade8..f228306 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -584,10 +584,13 @@ if ipv4.defaultRoute is not None: cfg += 'DEFROUTE=%s\n' % _to_ifcfg_bool(ipv4.defaultRoute) cfg += 'NM_CONTROLLED=no\n' - if ipv6.address or ipconfig.ipv6autoconf or ipconfig.dhcpv6: + if ipv6.addresses or ipconfig.ipv6autoconf or ipconfig.dhcpv6: cfg += 'IPV6INIT=yes\n' - if ipv6.address is not None: - cfg += 'IPV6ADDR=%s\n' % pipes.quote(ipv6.address) + if ipv6.addresses: + cfg += 'IPV6ADDR=%s\n' % pipes.quote(ipv6.addresses[0]) + if len(ipv6.addresses) > 1: + cfg += 'IPV6ADDR_SECONDARIES=%s\n' % pipes.quote( + ' '.join(ipv6.addresses[1:])) if ipv6.gateway is not None: cfg += 'IPV6_DEFAULTGW=%s\n' % pipes.quote(ipv6.gateway) elif ipconfig.dhcpv6: @@ -701,7 +704,10 @@ if ipv4.defaultRoute is None and confParams.get('DEFROUTE'): ipv4.defaultRoute = _from_ifcfg_bool(confParams['DEFROUTE']) if confParams.get('IPV6INIT') == 'yes': - ipv6.address = confParams.get('IPV6ADDR') + ipv6addr = confParams.get('IPV6ADDR') + ipv6addrs = confParams.get('IPV6ADDR_SECONDARIES') + ipv6.addresses = ([ipv6addr] if ipv6addr else []) + ( + ipv6addrs.split() if ipv6addrs else []) ipv6.gateway = confParams.get('IPV6_DEFAULTGW') ipconfig.ipv6autoconf = ( confParams.get('IPV6_AUTOCONF') == 'yes') diff --git a/vdsm/network/configurators/iproute2.py b/vdsm/network/configurators/iproute2.py index 1cde1cc..045ed66 100644 --- a/vdsm/network/configurators/iproute2.py +++ b/vdsm/network/configurators/iproute2.py @@ -225,16 +225,17 @@ ipconfig = iface.ipconfig ipv4 = ipconfig.ipv4 ipv6 = ipconfig.ipv6 - if ipv4.address or ipv6.address: + if ipv4.address or ipv6.addresses: self.removeIpConfig(iface) if ipv4.address: ipwrapper.addrAdd(iface.name, ipv4.address, ipv4.netmask) if ipv4.gateway and ipv4.defaultRoute: ipwrapper.routeAdd(['default', 'via', ipv4.gateway]) - if ipv6.address: - ipv6addr, ipv6netmask = ipv6.address.split('/') - ipwrapper.addrAdd(iface.name, ipv6addr, ipv6netmask, family=6) + if ipv6.addresses: + for address in ipv6.addresses: + ipv6addr, ipv6netmask = address.split('/') + ipwrapper.addrAdd(iface.name, ipv6addr, ipv6netmask, family=6) if ipv6.gateway: ipwrapper.routeAdd(['default', 'via', ipv6.gateway], dev=iface.name, family=6) diff --git a/vdsm/network/configurators/pyroute_two.py b/vdsm/network/configurators/pyroute_two.py index 221e142..a6833d5 100644 --- a/vdsm/network/configurators/pyroute_two.py +++ b/vdsm/network/configurators/pyroute_two.py @@ -59,7 +59,7 @@ ipconfig = iface.ipconfig ipv4 = ipconfig.ipv4 ipv6 = ipconfig.ipv6 - if ipv4.address or ipv6.address: + if ipv4.address or ipv6.addresses: self.removeIpConfig(iface) if ipv4.address: with self.ip.interfaces[iface.name] as i: @@ -67,9 +67,10 @@ if ipv4.gateway and ipv4.defaultRoute: self.ip.routes.add({'dst': 'default', 'gateway': ipv4.gateway}).commit() - if ipv6.address: + if ipv6.addresses: with self.ip.interfaces[iface.name] as i: - i.add_ip(ipv6.address) + for address in ipv6.addresses: + i.add_ip(address) if ipv6.gateway: self.ip.routes.add({'dst': 'default', 'gateway': ipv6.gateway}).commit() diff --git a/vdsm/network/models.py b/vdsm/network/models.py index 1d34c88..2c577de 100644 --- a/vdsm/network/models.py +++ b/vdsm/network/models.py @@ -410,20 +410,24 @@ class IPv6(object): - def __init__(self, address=None, gateway=None, defaultRoute=None): - if address: - self.validateAddress(address) + def __init__(self, addresses=None, gateway=None, defaultRoute=None): + if addresses: + # TODO: Do we want this? + # if isinstance(addresses, str): + # addresses = addresses.split() + for address in addresses: + self.validateAddress(address) if gateway: self.validateGateway(gateway) elif gateway: raise ConfigNetworkError(ne.ERR_BAD_ADDR, 'Specified gateway but ' 'not ip address.') - self.address = address + self.addresses = addresses self.gateway = gateway self.defaultRoute = defaultRoute def __repr__(self): - return 'IPv6(%s, %s, %s)' % (self.address, self.gateway, + return 'IPv6(%s, %s, %s)' % (self.addresses, self.gateway, self.defaultRoute) @classmethod @@ -465,7 +469,7 @@ if ipv6 is None: ipv6 = IPv6() if (ipv4.address and bootproto == 'dhcp') or \ - (ipv6.address and (ipv6autoconf or dhcpv6)): + (ipv6.addresses and (ipv6autoconf or dhcpv6)): raise ConfigNetworkError(ne.ERR_BAD_ADDR, 'Static and dynamic IP ' 'configurations are mutually exclusive.') self.ipv4 = ipv4 @@ -477,8 +481,8 @@ def __nonzero__(self): # iproute2 and pyroute_two check that IP configuration is not empty - return bool(self.ipv4.address or self.ipv6.address or self.bootproto or - self.ipv6autoconf or self.dhcpv6) + return bool(self.ipv4.address or self.ipv6.addresses or self.bootproto + or self.ipv6autoconf or self.dhcpv6) def __repr__(self): return 'IpConfig(%r, %r, %s, %s, %s)' % (self.ipv4, self.ipv6, -- To view, visit https://gerrit.ovirt.org/39307 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d16083781919fe5e5d9c75e9dd4ab744afe45be Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

5 32

Change in vdsm[master]: contrib: Add tool for getting hsm stats
by Nir Soffer 03 Jul '16

03 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: contrib: Add tool for getting hsm stats ...................................................................... contrib: Add tool for getting hsm stats This is a very simple tool showing historgam of hsm calls in the given log files. Example: $ hsmstat vdsm.log.1 vdsm.log.2 8515 getVolumeSize 2258 repoStats 51 getVolumeInfo 30 getVolumesList 19 teardownImage ... We can get same output or better using logdb by writing some smart sql. Change-Id: Ia6013da71ca96535b98edace8577a4d8bb529465 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- A contrib/hsmstat 1 file changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/38748/1 diff --git a/contrib/hsmstat b/contrib/hsmstat new file mode 100755 index 0000000..d3400d2 --- /dev/null +++ b/contrib/hsmstat @@ -0,0 +1,39 @@ +#!/usr/bin/env python +# +# Copyright 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +from collections import defaultdict +import fileinput +import re + +verb_re = re.compile(r" Run and protect: (?P<name>.+)\(") + +verbs = defaultdict(int) + +for line in fileinput.input(): + match = verb_re.search(line) + if match: + name = match.group('name') + verbs[name] += 1 + +histogram = sorted(((count, verb) for verb, count in verbs.iteritems()), + reverse=True) +for count, name in histogram: + print " %6d %s" % (count, name) -- To view, visit https://gerrit.ovirt.org/38748 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6013da71ca96535b98edace8577a4d8bb529465 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

3 8

Change in vdsm[master]: contrib: Add tool for getting repoStats statistics
by Nir Soffer 03 Jul '16

03 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: contrib: Add tool for getting repoStats statistics ...................................................................... contrib: Add tool for getting repoStats statistics This tool is useful when debugging storage domain monitoring issues. Examples: $ repostat vdsm.log.* domain: ebcd25b1-1ab0-47e3-aa8b-83ee5f91b5bd delay avg: 0.093941 min: 0.000430 max: 1.499200 last check avg: 5.117508 min: 0.000000 max: 12.300000 domain: 6d7f7a48-4511-43b8-8abf-d323f7118b19 delay avg: 0.001090 min: 0.000300 max: 0.030056 last check avg: 4.975313 min: 0.000000 max: 10.200000 Change-Id: Id5f7828216058bb401f8a472fa5601e79542def1 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M Makefile.am A contrib/repostat 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/38749/1 diff --git a/Makefile.am b/Makefile.am index 34885a1..7407b22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,7 @@ autogen.sh \ build-aux/pkg-version \ contrib/profile-stats \ + contrib/repostat \ pylintrc \ vdsm.spec \ vdsm.spec.in \ @@ -80,6 +81,7 @@ WHITELIST = \ contrib/profile-stats \ + contrib/repostat \ init/daemonAdapter \ vdsm/get-conf-item \ vdsm/set-conf-item \ diff --git a/contrib/repostat b/contrib/repostat new file mode 100755 index 0000000..c140b4c --- /dev/null +++ b/contrib/repostat @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# +# Copyright 2015 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 +# +""" +Parse repoStats log lines and calculate statistics. + +Usage: repostat vdsm.log [...] +""" + +import fileinput +import re + +repostat_re = re.compile(r' Run and protect: repoStats, Return response: ') + +stats = {} + + +def liststat(a): + b = sorted(a) + return sum(b) / len(b), b[0], b[-1] + + +for line in fileinput.input(): + match = repostat_re.search(line) + if not match: + continue + response = eval(line[match.end():]) + for uuid, info in response.items(): + stats.setdefault(uuid, {'delays': [], 'checks': []}) + stats[uuid]['delays'].append(float(info['delay'])) + stats[uuid]['checks'].append(float(info['lastCheck'])) + +for uuid, info in stats.iteritems(): + print 'domain:', uuid + print ' delay avg: %f min: %f max: %f' % liststat(info['delays']) + print ' last check avg: %f min: %f max: %f' % liststat(info['checks']) -- To view, visit https://gerrit.ovirt.org/38749 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5f7828216058bb401f8a472fa5601e79542def1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

3 6

Change in vdsm[master]: gluster: rename glusterCreateBrick to glusterBrickCreate
by barumuga＠redhat.com 02 Jul '16

02 Jul '16

Hello Piotr Kliczewski, Timothy Asir, Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42308 to review the following change. Change subject: gluster: rename glusterCreateBrick to glusterBrickCreate ...................................................................... gluster: rename glusterCreateBrick to glusterBrickCreate To make consistency in function names in supervdsm and verb names in vdsm, this patch renames verb glusterCreateBrick to glusterBrickCreate Change-Id: I367a864bc9bf4aa9b6a0d36b64f541fa89c61c0d Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M client/vdsClientGluster.py M vdsm/gluster/api.py M vdsm/gluster/apiwrapper.py M vdsm/gluster/storagedev.py M vdsm/rpc/vdsmapi-gluster-schema.json 5 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/42308/1 diff --git a/client/vdsClientGluster.py b/client/vdsClientGluster.py index a4bce63..76b91e1 100644 --- a/client/vdsClientGluster.py +++ b/client/vdsClientGluster.py @@ -633,7 +633,7 @@ pp.pprint(status) return status['status']['code'], status['status']['message'] - def do_glusterCreateBrick(self, args): + def do_glusterBrickCreate(self, args): params = self._eqSplit(args) devList = params.get('devices', '').split(',') brickName = params.get('brickName', '') @@ -646,7 +646,7 @@ raidParams['stripeSize'] = int(params.get('stripeSize', 0)) raidParams['pdCount'] = int(params.get('pdCount', 0)) - status = self.s.glusterCreateBrick(brickName, mountPoint, + status = self.s.glusterBrickCreate(brickName, mountPoint, devList, fsType, raidParams) pp.pprint(status) return status['status']['code'], status['status']['message'] @@ -1172,8 +1172,8 @@ ('[volumeName=<volume_name>]', 'snapshot list for given volume' )), - 'glusterCreateBrick': ( - serv.do_glusterCreateBrick, + 'glusterBrickCreate': ( + serv.do_glusterBrickCreate, ('brickName=<brick_name> mountPoint=<mountPoint> ' 'devices=<device[,device, ...]> ' '[raidType=<raid_type>] [stripeSize=<stripe_size>] ' diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index 24b8230..918c3cc 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -672,9 +672,9 @@ return {'snapshotList': status} @exportAsVerb - def createBrick(self, name, mountPoint, devList, fsType=None, + def brickCreate(self, name, mountPoint, devList, fsType=None, raidParams={}, options=None): - status = self.svdsmProxy.glusterCreateBrick(name, + status = self.svdsmProxy.glusterBrickCreate(name, mountPoint, devList, fsType, diff --git a/vdsm/gluster/apiwrapper.py b/vdsm/gluster/apiwrapper.py index 4768a86..f607dd4 100644 --- a/vdsm/gluster/apiwrapper.py +++ b/vdsm/gluster/apiwrapper.py @@ -81,9 +81,9 @@ def storageDevicesList(self, options=None): return self._gluster.storageDevicesList() - def createBrick(self, name, mountPoint, devList, fsType=None, + def brickCreate(self, name, mountPoint, devList, fsType=None, raidParams={}): - return self._gluster.createBrick(name, mountPoint, + return self._gluster.brickCreate(name, mountPoint, devList, fsType, raidParams) diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py index 2aeabad..f4178e9 100644 --- a/vdsm/gluster/storagedev.py +++ b/vdsm/gluster/storagedev.py @@ -123,7 +123,7 @@ @makePublic -def createBrick(brickName, mountPoint, devNameList, fsType=DEFAULT_FS_TYPE, +def brickCreate(brickName, mountPoint, devNameList, fsType=DEFAULT_FS_TYPE, raidParams={}): def _getDeviceList(devNameList): return [blivetEnv.devicetree.getDeviceByName(devName.split("/")[-1]) diff --git a/vdsm/rpc/vdsmapi-gluster-schema.json b/vdsm/rpc/vdsmapi-gluster-schema.json index c86f43c..209bfbd 100644 --- a/vdsm/rpc/vdsmapi-gluster-schema.json +++ b/vdsm/rpc/vdsmapi-gluster-schema.json @@ -1274,7 +1274,7 @@ 'data': {'type': 'str', 'stripeSize': 'int', 'diskCnt': 'int'}} ## -# @GlusterHost.createBrick: +# @GlusterHost.brickCreate: # # Create a brick for the gluster volume # @@ -1293,7 +1293,7 @@ # # Since: 4.17.0 ## -{'command': {'class': 'GlusterHost', 'name': 'createBrick'}, +{'command': {'class': 'GlusterHost', 'name': 'brickCreate'}, 'data': {'name': 'str', 'mountPoint': 'str', 'devList': ['str'], '*fsType': 'str', '*raidParams': 'RaidDevice'}, 'returns': 'bool'} -- To view, visit https://gerrit.ovirt.org/42308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I367a864bc9bf4aa9b6a0d36b64f541fa89c61c0d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

4 4

Change in vdsm[master]: tests: Add time per test if nose-timer is available
by asegurap＠redhat.com 02 Jul '16

02 Jul '16

Antoni Segura Puimedon has uploaded a new change for review. Change subject: tests: Add time per test if nose-timer is available ...................................................................... tests: Add time per test if nose-timer is available This patch adds an output like: resourceManagerTests.ResourceManagerTests.testStressTest: 12.8313s resourceManagerTests.ResourceManagerTests.testResourceAcquireTimeout: 1.0069s resourceManagerTests.ResourceManagerTests.testResourceLockSwitch: 0.0108s resourceManagerTests.ResourceManagerTests.testResourceAutorelease: 0.0101s resourceManagerTests.ResourceManagerTests.testResourceInvalidation: 0.0093s resourceManagerTests.ResourceManagerTests.testCrashOnSwitch: 0.0067s resourceManagerTests.ResourceManagerTests.testResourceSwitchLockTypeFail: 0.0062s resourceManagerTests.ResourceManagerTests.testCancelExclusiveBetweenShared: 0.0049s resourceManagerTests.ResourceManagerTests.testAcquireResourceExclusive: 0.0042s resourceManagerTests.ResourceManagerTests.testCancelRequest: 0.0031s resourceManagerTests.ResourceManagerTests.testRequestRefCmp: 0.0030s resourceManagerTests.ResourceManagerTests.testRequestRecancel: 0.0030s resourceManagerTests.ResourceManagerTests.testResourceStatuses: 0.0029s resourceManagerTests.ResourceManagerTests.testAccessAttributeNotExposedByRequestRef: 0.0029s resourceManagerTests.ResourceManagerTests.testFailCreateAfterSwitch: 0.0025s resourceManagerTests.ResourceManagerTests.testRequestWithBadCallbackOnCancel: 0.0025s resourceManagerTests.ResourceManagerTests.testAcquireResourceShared: 0.0023s resourceManagerTests.ResourceManagerTests.testRereleaseResource: 0.0022s resourceManagerTests.ResourceManagerTests.testResourceWrapper: 0.0020s resourceManagerTests.ResourceManagerTests.testRequestWithBadCallbackOnGrant: 0.0020s resourceManagerTests.ResourceManagerTests.testRequestRefStr: 0.0020s resourceManagerTests.ResourceManagerTests.testAccessAttributeNotExposedByWrapper: 0.0019s resourceManagerTests.ResourceManagerTests.testErrorInFactory: 0.0017s resourceManagerTests.ResourceManagerTests.testAcquireNonExistingResource: 0.0016s resourceManagerTests.ResourceManagerTests.testRequestInvalidResource: 0.0015s resourceManagerTests.ResourceManagerTests.testRequestRegrant: 0.0015s resourceManagerTests.ResourceManagerTests.testResourceAcquireInvalidTimeout: 0.0014s resourceManagerTests.ResourceManagerTests.testReleaseInvalidResource: 0.0014s resourceManagerTests.ResourceManagerTests.testSingleton: 0.0014s resourceManagerTests.ResourceManagerTests.testForceRegisterNamespace: 0.0013s resourceManagerTests.ResourceManagerTests.testListNamespaces: 0.0013s resourceManagerTests.ResourceManagerTests.testReregisterNamespace: 0.0012s resourceManagerTests.ResourceManagerTests.testRegisterInvalidNamespace: 0.0012s At the end of the usual tests if nose-timer is detected in the system. It shows the tests over 500ms in yellow and those over 5s in red. If you want to get this output, do: pip install nose-timer Change-Id: I4960b30532a84abd259fb268c7e40a1751847a96 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M tests/run_tests_local.sh.in M tests/testrunner.py 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/30171/1 diff --git a/tests/run_tests_local.sh.in b/tests/run_tests_local.sh.in index d19f22c..f51473d 100644 --- a/tests/run_tests_local.sh.in +++ b/tests/run_tests_local.sh.in @@ -7,4 +7,9 @@ @top_srcdir@/tests/makecert.sh fi -PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir@/tests/testrunner.py --local-modules $@ +python -c 'import nosetimer' > /dev/null 2>&1 +if [ $? -eq 0 ]; then + EXTRA_ARGS='--with-timer' +fi + +PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir@/tests/testrunner.py --local-modules $@ "$EXTRA_ARGS" diff --git a/tests/testrunner.py b/tests/testrunner.py index eed743f..ec24c2b 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -40,6 +40,16 @@ from nose import config from nose import core from nose import result +try: + from nosetimer.plugin import TimerPlugin +except ImportError: + timer_plugin = None +else: + timer_plugin = TimerPlugin() + timer_plugin.enabled = True + timer_plugin.timer_ok = 500 # Okay <= 500ms + timer_plugin.timer_warning = 5000 # Warn > 5s + timer_plugin.timer_no_color = False # Enable color output from testValidation import SlowTestsPlugin, StressTestsPlugin @@ -378,6 +388,8 @@ plugins=core.DefaultPluginManager()) conf.plugins.addPlugin(SlowTestsPlugin()) conf.plugins.addPlugin(StressTestsPlugin()) + if timer_plugin is not None: + conf.plugins.addPlugin(timer_plugin) runner = VdsmTestRunner(stream=conf.stream, verbosity=conf.verbosity, -- To view, visit http://gerrit.ovirt.org/30171 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4960b30532a84abd259fb268c7e40a1751847a96 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

6 13

Change in vdsm[master]: ImageManifest: create_image_dir
by alitke＠redhat.com 02 Jul '16

02 Jul '16

Adam Litke has uploaded a new change for review. Change subject: ImageManifest: create_image_dir ...................................................................... ImageManifest: create_image_dir Change-Id: I94a8cfdd9fb1f3c3fd4e4e2ab409bfd287829351 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M tests/image_manifest_tests.py M vdsm/storage/image.py 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/43557/1 diff --git a/tests/image_manifest_tests.py b/tests/image_manifest_tests.py index a2ac1c0..a27eabd 100644 --- a/tests/image_manifest_tests.py +++ b/tests/image_manifest_tests.py @@ -23,6 +23,7 @@ from testlib import VdsmTestCase, namedTemporaryDir from storage import sd, image +from storage.sdm import sdm_verb class ImageManifestTests(VdsmTestCase): @@ -33,3 +34,14 @@ manifest = image.ImageManifest(tmpdir) expected = os.path.join(tmpdir, sduuid, sd.DOMAIN_IMAGES, imguuid) self.assertEquals(expected, manifest.getImageDir(sduuid, imguuid)) + + @sdm_verb + def test_create_image_dir(self): + with namedTemporaryDir() as tmpdir: + sduuid = str(uuid.uuid4()) + imguuid = str(uuid.uuid4()) + manifest = image.ImageManifest(tmpdir) + os.makedirs(os.path.join(tmpdir, sduuid, sd.DOMAIN_IMAGES)) + manifest.create_image_dir(sduuid, imguuid) + self.assertTrue(os.path.exists(manifest.getImageDir(sduuid, + imguuid))) \ No newline at end of file diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 81b2043..5f87921 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -38,6 +38,7 @@ from threadLocal import vars import resourceFactories import resourceManager as rm +from sdm import require_sdm log = logging.getLogger('Storage.Image') rmanager = rm.ResourceManager.getInstance() @@ -97,6 +98,13 @@ """ return os.path.join(self.repoPath, sdUUID, sd.DOMAIN_IMAGES, imgUUID) + @require_sdm + def create_image_dir(self, sd_id, img_id): + img_dir = self.getImageDir(sd_id, img_id) + if not os.path.isdir(img_dir): + log.info("Create placeholder %s for image's volumes", img_dir) + os.mkdir(img_dir) + return img_dir class Image: """ Actually represents a whole virtual disk. -- To view, visit https://gerrit.ovirt.org/43557 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94a8cfdd9fb1f3c3fd4e4e2ab409bfd287829351 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

3 10

Change in vdsm[master]: tests: Add a live merge functional test
by alitke＠redhat.com 02 Jul '16

02 Jul '16

Adam Litke has uploaded a new change for review. Change subject: tests: Add a live merge functional test ...................................................................... tests: Add a live merge functional test Test whether we can successfully merge the active layer. Uses lots of the functional test infrastructure! Only runs if vdsm says it can support live merge. Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M tests/functional/utils.py M tests/functional/virtTests.py 2 files changed, 185 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/29824/1 diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 494be98..e3cdba6 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -228,3 +228,41 @@ def updateVmPolicy(self, vmId, vcpuLimit): result = self.vdscli.updateVmPolicy([vmId, vcpuLimit]) return result['status']['code'], result['status']['message'] + + def getTaskStatus(self, taskId): + result = self.vdscli.getTaskStatus(taskId) + return result['status']['code'], result['status']['message'],\ + result['taskStatus'] + + def getVolumeInfo(self, sdId, spId, imgId, volId): + result = self.vdscli.getVolumeInfo(sdId, spId, imgId, volId) + return result['status']['code'], result['status']['message'],\ + result['info'] + + def createVolume(self, sdId, spId, imgId, size, volFormat, preallocate, + diskType, volId, desc, baseImgId, baseVolId): + result = self.vdscli.createVolume(sdId, spId, imgId, size, volFormat, + preallocate, diskType, volId, desc, + baseImgId, baseVolId) + return result['status']['code'], result['status']['message'],\ + result['uuid'] + + def deleteVolume(self, sdId, spId, imgId, volIds, postZero=False, + force=False): + result = self.vdscli.deleteVolume(sdId, spId, imgId, volIds, postZero, + force) + return result['status']['code'], result['status']['message'],\ + result['uuid'] + + def snapshot(self, vmId, snapDrives, snapMemVolHandle=''): + result = self.vdscli.snapshot(vmId, snapDrives, snapMemVolHandle) + return result['status']['code'], result['status']['message'] + + def merge(self, vmId, drive, base, top, bandwidth, jobId): + result = self.vdscli.merge(vmId, drive, base, top, bandwidth, jobId) + return result['status']['code'], result['status']['message'] + + def list(self, fullStatus=False, vmList=()): + result = self.vdscli.list(fullStatus, vmList) + return result['status']['code'], result['status']['message'], \ + result['vmList'] diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py index 94ce240..b811b92 100644 --- a/tests/functional/virtTests.py +++ b/tests/functional/virtTests.py @@ -22,6 +22,7 @@ import math import tempfile import logging +import uuid from stat import S_IROTH from functools import partial, wraps @@ -32,7 +33,8 @@ from testrunner import temporaryPath from vdsm.utils import CommandPath, RollbackContext -import storageTests as storage +import storageTests +import storage from storage.misc import execCmd from utils import VdsProxy, SUCCESS @@ -109,6 +111,18 @@ return method(self, *args, **kwargs) else: raise SkipTest('KVM is not enabled') + return wrapped + + +def requireLiveMerge(method): + @wraps(method) + def wrapped(self, *args, **kwargs): + status, msg, result = self.vdsm.getVdsCapabilities() + self.assertEqual(status, SUCCESS, msg) + if result.get('liveMerge') == 'true': + return method(self, *args, **kwargs) + else: + raise SkipTest('Live Merge is not available') return wrapped @@ -227,9 +241,9 @@ @requireKVM @permutations([['localfs'], ['iscsi'], ['nfs']]) def testVmWithStorage(self, backendType): - disk = storage.StorageTest() + disk = storageTests.StorageTest() disk.setUp() - conf = storage.storageLayouts[backendType] + conf = storageTests.storageLayouts[backendType] drives = disk.generateDriveConf(conf) customization = {'vmId': '88888888-eeee-ffff-aaaa-111111111111', 'vmName': 'testVmWithStorage' + backendType, @@ -247,8 +261,8 @@ def testVmWithDevice(self, *devices): customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222', 'vmName': 'testVm', 'devices': [], 'display': 'vnc'} - storageLayout = storage.storageLayouts['localfs'] - diskSpecs = storage.StorageTest.generateDriveConf(storageLayout) + storageLayout = storageTests.storageLayouts['localfs'] + diskSpecs = storageTests.StorageTest.generateDriveConf(storageLayout) pciSpecs = {'bus': '0x00', 'domain': '0x0000', 'function': '0x0', 'type': 'pci'} ccidSpecs = {'slot': '0', 'controller': '0', 'type': 'ccid'} @@ -412,3 +426,131 @@ self.vdsm.updateVmPolicy(customization['vmId'], '50') self.assertEqual(status, SUCCESS, msg) + + +@expandPermutations +class LiveMergeTest(VirtTestBase): + def _waitTask(self, taskId): + def assertTaskOK(): + status, msg, result = self.vdsm.getTaskStatus(taskId) + self.assertEqual(status, SUCCESS, msg) + self.assertEquals(result['taskState'], 'finished') + + self.retryAssert(assertTaskOK, timeout=60) + + def _waitBlockJobs(self, vmId, jobIds): + def assertJobsGone(): + status, msg, result = self.vdsm.getVmStats(vmId) + self.assertEqual(status, SUCCESS, msg) + self.assertTrue('vmJobs' in result) + self.assertTrue(all([x not in result['vmJobs'].keys() + for x in jobIds])) + + self.retryAssert(assertJobsGone, timeout=60) + + def _snapshotVM(self, vmId, drives, rollback): + snapDrives = [] + for drive in drives: + sd = drive['domainID'] + sp = drive['poolID'] + img = drive['imageID'] + vol = drive['volumeID'] + newVol = str(uuid.uuid4()) + volFormat = storage.volume.COW_FORMAT + preallocate = storage.volume.SPARSE_VOL + desc = 'snapshot for %s' % vol + + # Create volume and wait + status, msg, result = self.vdsm.getVolumeInfo(sd, sp, img, vol) + self.assertEqual(status, SUCCESS, msg) + size = result['capacity'] + diskType = result['disktype'] + + status, msg, taskId = self.vdsm.createVolume(sd, sp, img, size, + volFormat, + preallocate, diskType, + newVol, desc, img, + vol) + self.assertEqual(status, SUCCESS, msg) + self._waitTask(taskId) + undo = lambda sd=sd, sp=sp, img=img, vol=newVol: \ + self._waitTask(self.vdsm.deleteVolume(sd, sp, img, vol)[2]) + rollback.prependDefer(undo) + + snapDrives.append({'domainID': sd, + 'imageID': img, + 'volumeID': newVol, + 'baseVolumeID': vol}) + + # Create snapshot + status, msg = self.vdsm.snapshot(vmId, snapDrives) + self.assertEqual(status, SUCCESS, msg) + return snapDrives + + def _orderChain(self, vmId, dev, chain): + parentMap = {} + for vol in chain: + status, msg, info = self.vdsm.getVolumeInfo(dev['domainID'], + dev['poolID'], + dev['imageID'], vol) + self.assertEqual(status, SUCCESS, msg) + parent = info['parent'] + parentMap[vol] = parent + + vol = dev['volumeID'] + chain = list() + while True: + chain.insert(0, vol) + vol = parentMap.get(vol, '00000000-0000-0000-0000-000000000000') + if vol == '00000000-0000-0000-0000-000000000000': + break + return chain + + def _getVolumeChains(self, vmId): + chains = {} + status, msg, result = self.vdsm.list(True, (vmId,)) + self.assertEqual(status, SUCCESS, msg) + vmDef = result[0] + for dev in vmDef['devices']: + if dev['device'] != 'disk': + continue + chains[dev['imageID']] = self._orderChain(vmId, dev, + [x['volumeID'] for x in + dev['volumeChain']]) + return chains + + @requireKVM + @requireLiveMerge + def testCapable(self): + pass + + @permutations([['localfs']]) + def testMergeActiveLayer(self, backendType): + disk = storageTests.StorageTest() + disk.setUp() + conf = storageTests.storageLayouts[backendType] + drives = disk.generateDriveConf(conf) + vmId = '12121212-abab-baba-abab-222222222222' + customization = {'vmId': vmId, + 'vmName': 'testMergeActive' + backendType, + 'drives': drives, + 'display': 'vnc'} + + with RollbackContext() as rollback: + disk.createVdsmStorageLayout(conf, 3, rollback) + with RunningVm(self.vdsm, customization) as vm: + self._waitForStartup(vm, VM_MINIMAL_UPTIME) + snapDrives = self._snapshotVM(vmId, drives, rollback) + chains = {} + jobIds = [] + for drive in snapDrives: + base = drive['baseVolumeID'] + top = drive['volumeID'] + jobId = str(uuid.uuid4()) + chains[drive['imageID']] = [base, top] + status, msg = self.vdsm.merge(vmId, drive, base, top, 0, + jobId) + jobIds.append(jobId) + self._waitBlockJobs(vmId, jobIds) + actual = self._getVolumeChains(vmId) + self.assertEquals(chains, actual) -- To view, visit http://gerrit.ovirt.org/29824 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd5a2f7eedaef9e90981256de66fc3ed21658e89 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

5 13

Change in vdsm[master]: vm: Support for non-ascii vm name
by Nir Soffer 02 Jul '16

02 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: vm: Support for non-ascii vm name ...................................................................... vm: Support for non-ascii vm name Libvirt does not support non-ascii vm name, failing creation of such vm. Use generated vm name based on vm id, used when vm name is not provided. For easier debugging, we log he non-ascii name when starting a vm: Non-ASCII vm name 'מכונה-ויראטואלית' And also the generaed name (same when vm name is not provided): Using generated vm name 'nb938182d-7f19-435b-9499-4cb8f1578e1b' Note: this change may break engine side, if it expects the original vm name in vdsm response. Fixing this on the engine side will avoid this issue and may be better idea. Tested with both jsonrpc and xmlrpc: - Creating vm with non-ascii name - Staring vm - Opening spice console - Stopping vm - Restarting vdsm while vm is running - Migrating to another host (broken with jsonrpc see bz1282054) Change-Id: I2386c0f98aeb8161feaf19c2862be229f73eb0df Bug-Url: https://bugzilla.redhat.com/1260131 Relates-To: https://bugzilla.redhat.com/1062943 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/48570/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index f9bc25c..a6d2bc8 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -299,8 +299,7 @@ self._devices = self._emptyDevMap() self._connection = libvirtconnection.get(cif) - if 'vmName' not in self.conf: - self.conf['vmName'] = 'n%s' % self.id + self.conf['vmName'] = self._normalizedVmName(params) self._guestSocketFile = self._makeChannelPath(_VMCHANNEL_DEVICE_NAME) self._qemuguestSocketFile = self._makeChannelPath(_QEMU_GA_DEVICE_NAME) self.guestAgent = guestagent.GuestAgent( @@ -380,6 +379,22 @@ break return str(idx) + def _normalizedVmName(self, params): + name = params.get('vmName') + if isinstance(name, unicode): + # Libvirt does not support non-ascii vm name + # See https://bugzilla.redhat.com/1260131 + try: + name = name.encode('ascii') + except UnicodeEncodeError: + self.log.debug("Non-ASCII vm name '%s'", name.encode('utf8')) + name = None + if name is None: + # Missing or non-ascii name + name = 'n' + params['vmId'] + self.log.debug("Using generated vm name %r", name) + return name + def _normalizeVdsmImg(self, drv): drv['reqsize'] = drv.get('reqsize', '0') # Backward compatible if 'device' not in drv: -- To view, visit https://gerrit.ovirt.org/48570 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2386c0f98aeb8161feaf19c2862be229f73eb0df Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 7

Change in vdsm[master]: automation: Enable xunit report
by Nir Soffer 02 Jul '16

02 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: automation: Enable xunit report ...................................................................... automation: Enable xunit report This used to segfault python in the past, but I think I fixed the root cause long time ago. Trying to use this again since it seems to give interesting output like the time it took to run each test. Change-Id: Ie8c09cf21e7cf4a97b7b006f2b3ebe4943ed72b9 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M automation/check-patch.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/46640/1 diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 15707e8..1dba426 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -14,7 +14,7 @@ " ./autogen.sh --system --enable-hooks -make check +make check NOSE_WITH_XUNIT=1 ./automation/build-artifacts.sh -- To view, visit https://gerrit.ovirt.org/46640 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8c09cf21e7cf4a97b7b006f2b3ebe4943ed72b9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 18

Change in vdsm[master]: fileSD: Keep deleted images name unique
by Nir Soffer 02 Jul '16

02 Jul '16

Nir Soffer has uploaded a new change for review. Change subject: fileSD: Keep deleted images name unique ...................................................................... fileSD: Keep deleted images name unique If an image delete fails, and same image is created again, the second image cannot be deleted, since the first image occupy the deleted image name. We use now _remove_me_<imagid>_<taskid>. This make it easy to locate the failed operation in vdsm or engine logs. Change-Id: Ia0582896d7ede028e9096da1a688e3e449ab0258 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/fileSD.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/48032/1 diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index dc4a68e..7d8074a 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -34,6 +34,7 @@ import outOfProcess as oop from remoteFileHandler import Timeout from persistentDict import PersistentDict, DictValidator +from threadLocal import vars from vdsm import constants from vdsm.utils import stripNewLines from vdsm import supervdsm @@ -204,7 +205,8 @@ def deleteImage(self, sdUUID, imgUUID, volsImgs): currImgDir = self.getImagePath(imgUUID) dirName, baseName = os.path.split(currImgDir) - toDelDir = os.path.join(dirName, sd.REMOVED_IMAGE_PREFIX + baseName) + newName = "%s%s_%s" % (sd.REMOVED_IMAGE_PREFIX, baseName, vars.task.id) + toDelDir = os.path.join(dirName, newName) self.log.debug("Renaming dir %s to %s", currImgDir, toDelDir) try: self.oop.os.rename(currImgDir, toDelDir) -- To view, visit https://gerrit.ovirt.org/48032 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0582896d7ede028e9096da1a688e3e449ab0258 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

3 4

Change in vdsm[master]: ipv6 hook: support ipv6addrs
by osvoboda＠redhat.com 02 Jul '16

02 Jul '16

Ondřej Svoboda has uploaded a new change for review. Change subject: ipv6 hook: support ipv6addrs ...................................................................... ipv6 hook: support ipv6addrs Change-Id: I722d0007840060cdccdb12e4fba2a2066f33c62f Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M vdsm_hooks/ipv6/README M vdsm_hooks/ipv6/ipv6.py 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/39359/1 diff --git a/vdsm_hooks/ipv6/README b/vdsm_hooks/ipv6/README index 05bd990..a96e2c2 100644 --- a/vdsm_hooks/ipv6/README +++ b/vdsm_hooks/ipv6/README @@ -5,13 +5,18 @@ Requirements: * oVirt-3.5 (started supporting custom properties) +New in version 4.18: (?) +-------------------- +Multiple IPv6 addresses are now accepted, see Usage. Please use 'ipv6addrs' +property instead of 'ipv6addr' which is deprecated. + Preparation on a host: ---------------------- yum install vdsm-hook-ipv6 Preparation on the engine side: ------------------------------- -PROPERTIES='ipv6addr=.*;ipv6gateway=.*;ipv6autoconf=.*;dhcpv6=.*' +PROPERTIES='ipv6addrs=.*;ipv6gateway=.*;ipv6autoconf=.*;dhcpv6=.*' engine-config -s "UserDefinedNetworkCustomProperties=$PROPERTIES" --cver='3.5' Don't forget to include the names of other custom network properties you may @@ -20,9 +25,10 @@ Usage: ------ In the oVirt UI open the 'Setup Host Networks' dialog. Proceed to editing -a desired logical network's properties. Among them you will find 'ipv6addr' -and 'ipv6gateway', which accept custom IPv6 addresses, plus 'ipv6autoconf' -and 'dhcpv6', which accept '0', '1' or 'false', 'true'. +a desired logical network's properties. Among them you will find 'ipv6addrs' +(which accepts a space-separated list of IPv6 addresses), 'ipv6gateway' +(a single address), plus 'ipv6autoconf' and 'dhcpv6', which accept '0', '1' or +'false', 'true'. You may be warned that the network is in use when confirming the 'Setup Host Networks' dialog. Make sure to stop any VMs that are using the network. diff --git a/vdsm_hooks/ipv6/ipv6.py b/vdsm_hooks/ipv6/ipv6.py index 6c00475..9385fab 100644 --- a/vdsm_hooks/ipv6/ipv6.py +++ b/vdsm_hooks/ipv6/ipv6.py @@ -34,7 +34,8 @@ def _process_network(attrs): - for property_name in ('ipv6addr', 'ipv6gateway', 'ipv6autoconf', 'dhcpv6'): + for property_name in ('ipv6addrs', 'ipv6addr', 'ipv6gateway', + 'ipv6autoconf', 'dhcpv6'): value = attrs['custom'].get(property_name) if value is not None: attrs[property_name] = value -- To view, visit https://gerrit.ovirt.org/39359 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I722d0007840060cdccdb12e4fba2a2066f33c62f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

5 20

Change in vdsm[master]: sourceroute: split gathering of routes and rules off configu...
by osvoboda＠redhat.com 02 Jul '16

02 Jul '16

Ondřej Svoboda has uploaded a new change for review. Change subject: sourceroute: split gathering of routes and rules off configure() and remove() ...................................................................... sourceroute: split gathering of routes and rules off configure() and remove() The code is too complex (for me) to understand. I want to remove the use of network configurators from the module because they actually call sourceroute classes' methods only to be called back: Ifcfg.configureNic, Configurator._addSourceRoute, StaticSourceRoute.configure, Ifcfg.configureSourceRoute Ifcfg.removeNic, Ifcfg._ifaceDownAndCleanup, Configurator._removeSourceRoute, StaticSourceRoute.remove (or DynamicSourceRoute), Ifcfg.removeSourceRoute Change-Id: I69d8949afbd5b8ba2cf14930533cda99a4580eb0 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M vdsm/network/sourceroute.py 1 file changed, 30 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/41593/1 diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py index 5f06de0..d7916ed 100644 --- a/vdsm/network/sourceroute.py +++ b/vdsm/network/sourceroute.py @@ -25,11 +25,7 @@ from vdsm import netinfo from vdsm.constants import P_VDSM_RUN -from vdsm.ipwrapper import IPRoute2Error -from vdsm.ipwrapper import Route -from vdsm.ipwrapper import routeShowTable -from vdsm.ipwrapper import Rule -from vdsm.ipwrapper import ruleList +from vdsm.ipwrapper import IPRoute2Error, Route, routeShowTable, Rule, ruleList from vdsm.utils import rmFile @@ -67,23 +63,32 @@ Rule(destination=self._network, table=self._table, srcDevice=self.device)] - def configure(self): + def _prepare_configuration(self): logging.info(("Configuring gateway - ip: %s, network: %s, " + "subnet: %s, gateway: %s, table: %s, device: %s") % (self._ipaddr, self._network, self._mask, self._gateway, self._table, self.device)) - routes = self._buildRoutes() - rules = self._buildRules() + self.routes = self._buildRoutes() + self.rules = self._buildRules() + def configure(self): + self._prepare_configuration() try: - self._configurator.configureSourceRoute(routes, rules, self.device) + self._configurator.configureSourceRoute(self.routes, self.rules, + self.device) except IPRoute2Error as e: logging.error('ip binary failed during source route configuration' ': %s', e.message) + def _prepare_removal(self): + self.routes = None + self.rules = None + def remove(self): - self._configurator.removeSourceRoute(None, None, self.device) + self._prepare_removal() + self._configurator.removeSourceRoute(self.routes, self.rules, + self.device) class DynamicSourceRoute(StaticSourceRoute): @@ -157,20 +162,23 @@ return rules + def _prepare_removal(self): + self.rules = self._getRules(self.device) + if self.rules: + self.table = self._getTable(self.rules) + if self.table: + self.routes = self._getRoutes(self.table) + def remove(self): logging.info("Removing gateway - device: %s", self.device) - - rules = self._getRules(self.device) - if rules: - table = self._getTable(rules) - if table: - try: - self._configurator.removeSourceRoute( - self._getRoutes(table), rules, - self.device) - except IPRoute2Error as e: - logging.error('ip binary failed during source route ' - 'removal: %s' % e.message) + self._prepare_removal() + if self.rules and self.table: + try: + self._configurator.removeSourceRoute( + self.routes, self.rules, self.device) + except IPRoute2Error as e: + logging.error('ip binary failed during source route ' + 'removal: %s' % e.message) @staticmethod def _isLibvirtInterfaceFallback(device): -- To view, visit https://gerrit.ovirt.org/41593 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69d8949afbd5b8ba2cf14930533cda99a4580eb0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

3 6

Change in vdsm[master]: sourceroute: move exception handling to the respective confi...
by osvoboda＠redhat.com 02 Jul '16

02 Jul '16

Ondřej Svoboda has uploaded a new change for review. Change subject: sourceroute: move exception handling to the respective configurator ...................................................................... sourceroute: move exception handling to the respective configurator Change-Id: I579b1789522eaed025d1c059bcf7a900e499ef32 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M vdsm/network/configurators/iproute2.py M vdsm/network/sourceroute.py 2 files changed, 16 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/41594/1 diff --git a/vdsm/network/configurators/iproute2.py b/vdsm/network/configurators/iproute2.py index c260bfe..bec32f7 100644 --- a/vdsm/network/configurators/iproute2.py +++ b/vdsm/network/configurators/iproute2.py @@ -201,17 +201,22 @@ @staticmethod def configureSourceRoute(routes, rules, device): - for route in routes: - routeAdd(route) - - for rule in rules: - ruleAdd(rule) + try: + for route in routes: + routeAdd(route) + for rule in rules: + ruleAdd(rule) + except IPRoute2Error as e: + logging.error('Source route configuration failed: %s', e.message) @staticmethod def removeSourceRoute(routes, rules, device): # Routes are removed automatically when the link goes down. - for rule in rules: - ruleDel(rule) + try: + for rule in rules: + ruleDel(rule) + except IPRoute2Error as e: + logging.error('Source route removal failed: %s' % e.message) class ConfigApplier(object): diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py index d7916ed..1fb9626 100644 --- a/vdsm/network/sourceroute.py +++ b/vdsm/network/sourceroute.py @@ -74,12 +74,8 @@ def configure(self): self._prepare_configuration() - try: - self._configurator.configureSourceRoute(self.routes, self.rules, - self.device) - except IPRoute2Error as e: - logging.error('ip binary failed during source route configuration' - ': %s', e.message) + self._configurator.configureSourceRoute(self.routes, self.rules, + self.device) def _prepare_removal(self): self.routes = None @@ -173,12 +169,8 @@ logging.info("Removing gateway - device: %s", self.device) self._prepare_removal() if self.rules and self.table: - try: - self._configurator.removeSourceRoute( - self.routes, self.rules, self.device) - except IPRoute2Error as e: - logging.error('ip binary failed during source route ' - 'removal: %s' % e.message) + self._configurator.removeSourceRoute(self.routes, self.rules, + self.device) @staticmethod def _isLibvirtInterfaceFallback(device): -- To view, visit https://gerrit.ovirt.org/41594 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I579b1789522eaed025d1c059bcf7a900e499ef32 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

3 7

Change in vdsm[master]: register: handle non uuid machines
by Douglas Schilling Landgraf 02 Jul '16

02 Jul '16

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: register: handle non uuid machines ...................................................................... register: handle non uuid machines If user machines doesn't provide UUID data this patch collects a random UUID from system. Change-Id: I9429e46895a73178cf459d5ced5d39499e993922 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1268854 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M lib/vdsm/tool/register.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/47385/1 diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py index 47c8412..d088bfc 100644 --- a/lib/vdsm/tool/register.py +++ b/lib/vdsm/tool/register.py @@ -256,7 +256,17 @@ if self.vdsm_uuid: self.uuid = self.vdsm_uuid else: - self.uuid = getHostUUID(legacy=False) + uuid_node = getHostUUID(legacy=False) + if uuid_node is None: + self.logger.debug("Collecting random UUID from system") + random_uuid_path = '/proc/sys/kernel/random/uuid' + if os.path.exists(random_uuid_path): + with open(random_uuid_path, 'r') as f: + self.uuid = f.readline().strip() + else: + raise RuntimeError("Unable to determine host UUID!") + else: + self.uuid = uuid_node self.url_reg += "&uniqueId={u}".format(u=self.uuid) -- To view, visit https://gerrit.ovirt.org/47385 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9429e46895a73178cf459d5ced5d39499e993922 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 6

Change in vdsm[master]: vm: do not call before_vm_create in dehibernation
by fromani＠redhat.com 28 Jun '16

28 Jun '16

Francesco Romani has uploaded a new change for review. Change subject: vm: do not call before_vm_create in dehibernation ...................................................................... vm: do not call before_vm_create in dehibernation For reasons unknown, VDSM calls the before_vm_create hook also in the dehibernation path. This is wasteful and useless at best, and most likely misleading and wrong, because VDSM logs the XML it produced, which is *not* what is gonna be used in the dehibernation path. The hook is fed with phony data, and the output of the hook is discarded. This patch dispel the lie and avoid to call the before_vm_create hook in the dehibernation path. Change-Id: I4c1377346b1ae63a1feb15e1458b5141c255c849 X-Backport-To: 3.6 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/45074/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index c54853a..b77b9df 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1887,8 +1887,6 @@ hooks.before_vm_dehibernate(srcDomXML, self.conf, {'FROM_SNAPSHOT': str(fromSnapshot)}) - # TODO: this silliness is only to preserve the old behaviour - hooks.before_vm_start(self._buildDomainXML(), self.conf) # TODO: this is debug information. For 3.6.x we still need to # see the XML even with 'info' as default level. self.log.info(srcDomXML) -- To view, visit https://gerrit.ovirt.org/45074 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c1377346b1ae63a1feb15e1458b5141c255c849 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 8

Change in vdsm[master]: api: allow setLogLevel to tune a specific logger
by fromani＠redhat.com 28 Jun '16

28 Jun '16

Francesco Romani has uploaded a new change for review. Change subject: api: allow setLogLevel to tune a specific logger ...................................................................... api: allow setLogLevel to tune a specific logger the not widely known setLogLevel VDSM verb allows to dinamically tune the log level of the root logger, until the next restart of VDSM. This patch extends the API to let the client tune any specific logger. Change-Id: I8f40488fac04031552f36b9de026a0062ab81db0 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/vdsmapi-schema.json 3 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/38426/1 diff --git a/vdsm/API.py b/vdsm/API.py index 85478b1..593f336 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1360,7 +1360,7 @@ return {'status': doneCode, 'info': stats} - def setLogLevel(self, level): + def setLogLevel(self, level, name=None): """ Set verbosity level of vdsm's log. @@ -1382,8 +1382,10 @@ except KeyError: return errCode['unavail'] else: - logging.info('Setting loglevel to %s (%d)', level, log_level) - _set_log_level(logging.getLogger(), log_level) + logger = logging.getLogger(name) + logging.info('Setting loglevel on %s to %s (%d)', + logger.name, level, log_level) + _set_log_level(logger, log_level) return {'status': doneCode} # VM-related functions diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index b01b661..ea0e0c3 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -583,9 +583,9 @@ return api.fenceNode(addr, port, agent, username, password, action, secure, options, policy) - def setLogLevel(self, level): + def setLogLevel(self, level, name=None): api = API.Global() - return api.setLogLevel(level) + return api.setLogLevel(level, name) def setMOMPolicy(self, policy): api = API.Global() diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 1d919e8..854e7aa 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -4030,10 +4030,14 @@ # # @level: The new verosity level desired # +# @name: #optional If present, change settings only for the logger +# with this name. Otherwise, change settings for the top-level +# logger (new in version 4.17.0). +# # Since: 4.10.0 ## {'command': {'class': 'Host', 'name': 'setLogLevel'}, - 'data': {'level': 'LoggingLevel'}} + 'data': {'level': 'LoggingLevel', '*name': 'str'}} ## # @Host.setSafeNetworkConfig: -- To view, visit https://gerrit.ovirt.org/38426 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f40488fac04031552f36b9de026a0062ab81db0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 36

Change in vdsm[master]: API: streamline and make setLogLevel correct
by fromani＠redhat.com 28 Jun '16

28 Jun '16

Francesco Romani has uploaded a new change for review. Change subject: API: streamline and make setLogLevel correct ...................................................................... API: streamline and make setLogLevel correct According to the schema, setLogLevel should accept a log level string ('DEBUG', 'INFO',...). But the code actually blindly casted the given value to int(), and this suggests the code actually expected an integer value. To make things a bit user friendlier and comformant to schema, change the argument to actually be a log level in string format. Along the way, this patch streamlines the implementation of setLogLevel and makes it simpler. Change-Id: Iaddbb12d13bdbaa7a02255ab209da11e42d2ea97 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/API.py 1 file changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/38425/1 diff --git a/vdsm/API.py b/vdsm/API.py index 5cbda50..85478b1 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1369,13 +1369,22 @@ Doesn't survive a restart """ - logging.info('Setting loglevel to %s', level) - handlers = logging.getLogger().handlers - [fileHandler] = [h for h in handlers if - isinstance(h, logging.FileHandler)] - fileHandler.setLevel(int(level)) + LEVELS = { + 'DEBUG': logging.DEBUG, + 'INFO': logging.INFO, + 'WARNING': logging.WARNING, + 'ERROR': logging.ERROR, + 'CRITICAL': logging.CRITICAL + } - return {'status': doneCode} + try: + log_level = LEVELS[level] + except KeyError: + return errCode['unavail'] + else: + logging.info('Setting loglevel to %s (%d)', level, log_level) + _set_log_level(logging.getLogger(), log_level) + return {'status': doneCode} # VM-related functions def getVMList(self, fullStatus=False, vmList=()): @@ -1772,3 +1781,9 @@ logging.warn("options %s is deprecated. Use %s instead" % (k, _translationMap[k])) options[_translationMap[k]] = options.pop(k) + + +def _set_log_level(logger, log_level): + for handler in logger.handlers: + if isinstance(handler, logging.FileHandler): + handler.setLevel(log_level) -- To view, visit https://gerrit.ovirt.org/38425 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaddbb12d13bdbaa7a02255ab209da11e42d2ea97 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 38

Change in vdsm[master]: virt: Correct VM state before vm.cont() in _recover()
by smelamud＠redhat.com 16 Jun '16

16 Jun '16

Shmuel Leib Melamud has uploaded a new change for review. Change subject: virt: Correct VM state before vm.cont() in _recover() ...................................................................... virt: Correct VM state before vm.cont() in _recover() In SourceThread._recover(), if error occured while hibernating a VM, set VM status to PAUSED before calling vm.cont(). Otherwise, vm.cont() will fail to run in SAVING_STATE state and the VM will be left paused. Change-Id: I5b1c7b4eecacf87ece48dc563fd2da294af0510b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1238536 Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com> --- M vdsm/virt/migration.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/47527/1 diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 32caccb..f950a6f 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -213,6 +213,7 @@ self.log.exception("Failed to destroy remote VM") # if the guest was stopped before migration, we need to cont it if self.hibernating: + self._vm.lastStatus = vmstatus.PAUSED self._vm.cont() # either way, migration has finished self._vm.lastStatus = vmstatus.UP -- To view, visit https://gerrit.ovirt.org/47527 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b1c7b4eecacf87ece48dc563fd2da294af0510b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shmuel Leib Melamud <smelamud(a)redhat.com>

4 9

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches April 2016