vdsm-patches September 2015

vdsm-patches@lists.fedorahosted.org

46 participants
667 discussions

Change in vdsm[master]: [WIP]ABRT integration
by ykaplan＠redhat.com 26 Mar '17

26 Mar '17

Yeela Kaplan has uploaded a new change for review. Change subject: [WIP]ABRT integration ...................................................................... [WIP]ABRT integration Change-Id: I1ca5e66c9f029be75483b86414e328d074c7e454 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=917062 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M init/systemd/vdsmd.service.in M init/vdsmd_init_common.sh.in M lib/vdsm/tool/configurators/Makefile.am A lib/vdsm/tool/configurators/abrt.py M vdsm.spec.in M vdsm/vdsm-logrotate 6 files changed, 138 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/44287/1 diff --git a/init/systemd/vdsmd.service.in b/init/systemd/vdsmd.service.in index d7d025f..ccacb2e 100644 --- a/init/systemd/vdsmd.service.in +++ b/init/systemd/vdsmd.service.in @@ -2,9 +2,10 @@ Description=Virtual Desktop Server Manager Requires=multipathd.service libvirtd.service time-sync.target \ iscsid.service rpcbind.service supervdsmd.service sanlock.service \ - vdsm-network.service + vdsm-network.service abrtd.service After=multipathd.service libvirtd.service iscsid.service rpcbind.service \ - supervdsmd.service sanlock.service vdsm-network.service + supervdsmd.service sanlock.service vdsm-network.service \ + abrtd.service Conflicts=libvirt-guests.service Wants=mom-vdsm.service diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index 00e4054..df2878c 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -83,16 +83,6 @@ return 0 } -task_configure_coredump() { - local conf_file="@CONFDIR@/vdsm.conf" - local getconfitem="@VDSMDIR@/get-conf-item" - - if "${getconfitem}" "${conf_file}" vars core_dump_enable false | - tr A-Z a-z | grep -q true; then - echo "/var/log/core/core.%p.%t.dump" > /proc/sys/kernel/core_pattern - fi -} - task_configure_vdsm_logs() { local vdsm_logs=" @VDSMLOGDIR@/connectivity.log @@ -296,7 +286,6 @@ --pre-start) run_tasks " \ mkdirs \ - configure_coredump \ configure_vdsm_logs \ wait_for_network \ run_init_hooks \ diff --git a/lib/vdsm/tool/configurators/Makefile.am b/lib/vdsm/tool/configurators/Makefile.am index 9fc7e57..f70b4bb 100644 --- a/lib/vdsm/tool/configurators/Makefile.am +++ b/lib/vdsm/tool/configurators/Makefile.am @@ -21,6 +21,7 @@ dist_configurators_PYTHON = \ __init__.py \ + abrt.py \ certificates.py \ libvirt.py \ multipath.py \ diff --git a/lib/vdsm/tool/configurators/abrt.py b/lib/vdsm/tool/configurators/abrt.py new file mode 100644 index 0000000..778f505 --- /dev/null +++ b/lib/vdsm/tool/configurators/abrt.py @@ -0,0 +1,132 @@ +# 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 sys +import os + +from .import \ + MAYBE, \ + NO +from .. import service +from ... import utils +from ... import constants + +from .. import conf_utils + +CONF_VERSION = '4.17.0' + + +services = ("abrtd",) + + +def configure(): + + conf_utils.remove_conf(FILES, CONF_VERSION) + + for conf_file, content in FILES.items(): + content['configure'](content, CONF_VERSION) + + +def isconfigured(): + """ + Check if abrt is already configured for vdsm + """ + ret = MAYBE + + for path in (conf_utils.get_persisted_files(FILES)): + if not conf_utils.open_config(path, CONF_VERSION).hasConf(): + ret = NO + + if ret == MAYBE: + sys.stdout.write("abrt is already configured for vdsm\n") + else: + sys.stdout.write("abrt is not configured for vdsm\n") + return ret + + +FILES = { + 'ABRT_CONF': { + 'path': os.path.join( + constants.SYSCONF_PATH, + 'abrt/abrt.conf' + ), + 'configure': conf_utils.add_section, + 'removeConf': conf_utils.remove_section, + 'persisted': True, + 'fragments': [ + { + 'conditions': {}, + 'content': { + 'DumpLocation': '/var/tmp/abrt' + }, + }, + ] + }, + 'CCPP_CONF': { + 'path': os.path.join( + constants.SYSCONF_PATH, + 'abrt/plugins/CCpp.conf' + ), + 'configure': conf_utils.add_section, + 'removeConf': conf_utils.remove_section, + 'persisted': True, + 'fragments': [ + { + 'conditions': {}, + 'content': { + 'Backtrace': 'yes' + }, + }, + ] + }, + 'PYTHON_CONF': { + 'path': os.path.join( + constants.SYSCONF_PATH, + 'abrt/plugins/python.conf' + ), + 'configure': conf_utils.add_section, + 'removeConf': conf_utils.remove_section, + 'persisted': True, + 'fragments': [ + { + 'conditions': {}, + 'content': { + 'Backtrace': 'yes' + }, + }, + ] + }, + 'PKG_CONF': { + 'path': os.path.join( + constants.SYSCONF_PATH, + 'abrt/abrt-action-save-package-data.conf' + ), + 'configure': conf_utils.add_section, + 'removeConf': conf_utils.remove_section, + 'persisted': True, + 'fragments': [ + { + 'conditions': {}, + 'content': { + 'openGPGCheck': 'no' + }, + }, + ] + } +} diff --git a/vdsm.spec.in b/vdsm.spec.in index 21e1b50..6e524c5 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -132,6 +132,7 @@ Requires: nfs-utils Requires: m2crypto Requires: libnl3 +Requires: abrt-desktop Requires: curl Requires: %{name}-xmlrpc = %{version}-%{release} Requires: %{name}-jsonrpc = %{version}-%{release} @@ -709,13 +710,6 @@ /etc/sysctl.conf fi -# hack until we replace core dump with abrt -if /usr/sbin/selinuxenabled; then - /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?' -fi -/sbin/restorecon -R /var/log/core >/dev/null 2>&1 -# hack until we replace core dump with abrt - # VDSM installs vdsm-modules-load.d.conf file - the following command will # refresh vdsm kernel modules requirements to start on boot /bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || : @@ -1097,6 +1091,7 @@ %{python_sitelib}/%{vdsm_name}/tool/conf_utils.py* %{python_sitelib}/%{vdsm_name}/tool/configurator.py* %{python_sitelib}/%{vdsm_name}/tool/configurators/__init__* +%{python_sitelib}/%{vdsm_name}/tool/configurators/abrt.py* %{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py* %{python_sitelib}/%{vdsm_name}/tool/configurators/libvirt.py* %{python_sitelib}/%{vdsm_name}/tool/configurators/passwd.py* diff --git a/vdsm/vdsm-logrotate b/vdsm/vdsm-logrotate index e2027ac..17d26ab 100755 --- a/vdsm/vdsm-logrotate +++ b/vdsm/vdsm-logrotate @@ -7,12 +7,4 @@ /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" fi -if [ -d /var/log/core ] ; then - /usr/bin/find /var/log/core -type f -name '*xz' -mtime +7 -exec /bin/rm -f '{}' \; - EXITVALUE=$? - if [ $EXITVALUE != 0 ]; then - /usr/bin/logger -t logrotate "ALERT clean old core files exited abnormally with [$EXITVALUE]" - fi -fi - exit $EXITVALUE -- To view, visit https://gerrit.ovirt.org/44287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ca5e66c9f029be75483b86414e328d074c7e454 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

3 8

Change in vdsm[master]: [WIP]configurators: move configurator functions into conf_utils
by ykaplan＠redhat.com 26 Mar '17

26 Mar '17

Yeela Kaplan has uploaded a new change for review. Change subject: [WIP]configurators: move configurator functions into conf_utils ...................................................................... [WIP]configurators: move configurator functions into conf_utils Change-Id: Id67a0f51adb2d543c0542a48c020d34a13d1f2ed Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M lib/vdsm/tool/Makefile.am A lib/vdsm/tool/conf_utils.py M vdsm.spec.in 3 files changed, 110 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/44286/1 diff --git a/lib/vdsm/tool/Makefile.am b/lib/vdsm/tool/Makefile.am index c8979ca..c3ed0cc 100644 --- a/lib/vdsm/tool/Makefile.am +++ b/lib/vdsm/tool/Makefile.am @@ -35,7 +35,8 @@ dump_bonding_defaults.py \ dump_volume_chains.py \ nwfilter.py \ - configfile.py \ + conf_utils.py \ + configfile.py \ configurator.py \ register.py \ restore_nets.py \ diff --git a/lib/vdsm/tool/conf_utils.py b/lib/vdsm/tool/conf_utils.py new file mode 100644 index 0000000..1308097 --- /dev/null +++ b/lib/vdsm/tool/conf_utils.py @@ -0,0 +1,107 @@ +# 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 os + +from .. configfile import ( + ConfigFile, +) + +from ... import utils + +if utils.isOvirtNode(): + from ovirt.node.utils.fs import Config as NodeCfg + + +def get_file(fname, files): + return files[fname]['path'] + + +def remove_conf(files, version): + for cfile, content in files.items(): + content['removeConf'](content['path'], version) + + +def add_section(content, version, vdsmConfiguration={}): + """ + Add a 'configuration section by vdsm' part to a config file. + This section contains only keys not originally defined + The section headers will include the current configuration version. + """ + configuration = {} + for fragment in content['fragments']: + if vdsmConfiguration: + if is_applicable(fragment, vdsmConfiguration): + configuration.update(fragment['content']) + else: + configuration.update(fragment['content']) + if configuration: + with open_config(content['path'], version) as conff: + for key, val in configuration.items(): + conff.addEntry(key, val) + + +def remove_section(path, version): + """ + remove entire 'configuration section by vdsm' section. + section is removed regardless of it's version. + """ + if os.path.exists(path): + with open_config(path, version) as conff: + conff.removeConf() + + +def remove_file(content, vdsmConfiguration): + """ + delete a file if it exists. + """ + if utils.isOvirtNode(): + NodeCfg().delete(content['path']) + else: + try: + os.unlink(content['path']) + except OSError as e: + if e.errno != errno.ENOENT: + raise + + +def get_persisted_files(files): + """ + get files where vdsm is expected to add a section. + """ + return [ + cfile['path'] for cfile in files.values() + if cfile['persisted'] + ] + + +def open_config(path, conf_version): + return ConfigFile(path, conf_version) + + +def is_applicable(fragment, vdsmConfiguration): + """ + Return true if 'fragment' should be included for current + configuration. An applicable fragment is a fragment who's list + of conditions are met according to vdsmConfiguration. + """ + applyFragment = True + for key, booleanValue in fragment['conditions'].items(): + if vdsmConfiguration[key] != booleanValue: + applyFragment = False + return applyFragment diff --git a/vdsm.spec.in b/vdsm.spec.in index 5020d8b..21e1b50 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1094,6 +1094,7 @@ %{python_sitelib}/%{vdsm_name}/tool/dummybr.py* %{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py* %{python_sitelib}/%{vdsm_name}/tool/nwfilter.py* +%{python_sitelib}/%{vdsm_name}/tool/conf_utils.py* %{python_sitelib}/%{vdsm_name}/tool/configurator.py* %{python_sitelib}/%{vdsm_name}/tool/configurators/__init__* %{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py* -- To view, visit https://gerrit.ovirt.org/44286 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id67a0f51adb2d543c0542a48c020d34a13d1f2ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

3 6

Change in vdsm[master]: contrib: Simple jsonrpc client
by Nir Soffer 30 Nov '16

30 Nov '16

Nir Soffer has uploaded a new change for review. Change subject: contrib: Simple jsonrpc client ...................................................................... contrib: Simple jsonrpc client This is a simple jsonrpc client for communicating with the jsonrpc server from the command line. Arguments method one of the mehtods described in json schema params optionl json object with message parameters Examples Calling method without arguements: # jsonrpc Host.getVMList { "jsonrpc": "2.0", "id": "0e043d83-294a-4d31-b1b6-6dc2f2747494", "result": [ "b3f6fa00-b315-4ad4-8108-f73da817b5c5" ] } Calling method with arguements: # jsonrpc VM.getStats '{"vmID": "b3f6fa00-b315-4ad4-8108-f73da817b5c5"}' { "jsonrpc": "2.0", "id": "cefd25a3-6250-4123-8a56-d7047899e19e", "result": [ { "status": "Down", "exitMessage": "Admin shut down from the engine", "vmId": "b3f6fa00-b315-4ad4-8108-f73da817b5c5", "exitReason": 6, "timeOffset": "0", "exitCode": 0 } ] } Requires stomp.py library: https://pypi.python.org/pypi/stomp.py Change-Id: Ia6273eabf6f3601602659d1e4e748d8025ae8084 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- A contrib/jsonrpc 1 file changed, 104 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/35181/1 diff --git a/contrib/jsonrpc b/contrib/jsonrpc new file mode 100755 index 0000000..3080193 --- /dev/null +++ b/contrib/jsonrpc @@ -0,0 +1,104 @@ +#!/usr/bin/python +# +# Copyright 2014 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +""" +jsonrpc-cli - Vdsm jsonrpc client +""" + +import json +import os +import signal +import sys +import time +import uuid +import optparse + +import stomp + +# Copied from lib/vdsm/vdscli.py +PKIDIR = '/etc/pki/vdsm' +KEYFILE = os.path.join(PKIDIR, 'keys/vdsmkey.pem') +CERTFILE = os.path.join(PKIDIR, 'certs/vdsmcert.pem') +CACERT = os.path.join(PKIDIR, 'certs/cacert.pem') + +PORT = 54321 +DESTINATION = "/queue/_local/vdsm/requests" + + +class Listener(stomp.ConnectionListener): + + def on_error(self, headers, message): + print 'Error: %s' % message + terminate() + + def on_message(self, headers, message): + msg = json.loads(message) + print json.dumps(msg, indent=4) + terminate() + + +def main(args): + parser = option_parser() + options, args = parser.parse_args(args) + if not args: + parser.error("method required") + + msg = { + "id": str(uuid.uuid4()), + "jsonrpc": "2.0", + "method": args[0] + } + + if len(args) > 1: + msg["params"] = json.loads(args[1]) + + conn = stomp.Connection10( + host_and_ports=((options.host, PORT),), + use_ssl=True, + ssl_key_file=KEYFILE, + ssl_cert_file=CERTFILE, + ssl_ca_certs=CACERT) + + conn.set_listener("", Listener()) + conn.start() + conn.send(body=json.dumps(msg), destination=DESTINATION) + + try: + signal.pause() + except KeyboardInterrupt: + pass + + conn.disconnect() + + +def option_parser(): + parser = optparse.OptionParser(usage='%prog [options] method [params]') + parser.add_option("-a", "--host", dest="host", + help="host address (default localhost)") + parser.set_defaults(host="localhost") + return parser + + +def terminate(): + os.kill(os.getpid(), signal.SIGINT) + + +if __name__ == "__main__": + main(sys.argv[1:]) -- To view, visit http://gerrit.ovirt.org/35181 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6273eabf6f3601602659d1e4e748d8025ae8084 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

9 53

Change in vdsm[master]: spbackends: simplify over-general evaluation
by Dan Kenigsberg 27 Nov '16

27 Nov '16

Dan Kenigsberg has uploaded a new change for review. Change subject: spbackends: simplify over-general evaluation ...................................................................... spbackends: simplify over-general evaluation The removed code is too clever for the use case of only two values. Change-Id: I775c4a6003a03c6b65bee3abc8559a88e3eaec01 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/spbackends.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/41253/1 diff --git a/vdsm/storage/spbackends.py b/vdsm/storage/spbackends.py index 953e01e..f6ce02b 100644 --- a/vdsm/storage/spbackends.py +++ b/vdsm/storage/spbackends.py @@ -229,8 +229,11 @@ def setSpmStatus(self, lVer=None, spmId=None): self.invalidateMetadata() - metaParams = dict(filter(lambda kv: kv[1] is not None, - ((PMDK_LVER, lVer), (PMDK_SPM_ID, spmId)))) + metaParams = {} + if lVer is not None: + metaParams[PMDK_LVER] = lVer + if spmId is not None: + metaParams[PMDK_SPM_ID] = spmId self._metadata.update(metaParams) @unsecured -- To view, visit https://gerrit.ovirt.org/41253 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I775c4a6003a03c6b65bee3abc8559a88e3eaec01 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

5 6

Change in vdsm[master]: virt: enable libgfapi
by ahino＠redhat.com 21 Oct '16

21 Oct '16

Ala Hino has uploaded a new change for review. Change subject: virt: enable libgfapi ...................................................................... virt: enable libgfapi This change is based on Federico's changes: https://gerrit.ovirt.org/33768/ Change-Id: I54b81e87b959b0b49c0f06810f88410e7c75de1d Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> Signed-off-by: Ala Hino <ahino(a)redhat.com> --- M vdsm/storage/glusterVolume.py M vdsm/storage/hsm.py M vdsm/virt/vm.py 3 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/44061/1 diff --git a/vdsm/storage/glusterVolume.py b/vdsm/storage/glusterVolume.py index 8f701ba..109d1c9 100644 --- a/vdsm/storage/glusterVolume.py +++ b/vdsm/storage/glusterVolume.py @@ -54,4 +54,5 @@ return {'volType': VmVolumeInfo.TYPE_NETWORK, 'path': glusterPath, 'protocol': 'gluster', 'volPort': volPort, 'volTransport': volTrans, - 'volfileServer': volfileServer} + 'volfileServer': volfileServer, + 'bricks': volInfo[volname]['bricks']} diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index f68d3bb..109cdfa 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3209,8 +3209,7 @@ path = os.path.join(dom.domaindir, sd.DOMAIN_IMAGES, imgUUID, volUUID) volInfo = {'domainID': sdUUID, 'imageID': imgUUID, - 'volumeID': volUUID, 'path': path, - 'volType': "path"} + 'volumeID': volUUID, 'path': path} leasePath, leaseOffset = dom.getVolumeLease(imgUUID, volUUID) @@ -3221,8 +3220,8 @@ }) imgVolumesInfo.append(volInfo) - if volUUID == leafUUID: - leafInfo = volInfo + + leafInfo = dom.produceVolume(imgUUID, leafUUID).getVmVolumeInfo() return {'path': leafPath, 'info': leafInfo, 'imgVolumesInfo': imgVolumesInfo} diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 71a74b3..2976f3b 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -805,6 +805,23 @@ # A destroy request has been issued, exit early break drive['path'] = self.cif.prepareVolumePath(drive, self.id) + if drive.get('diskType') == DISK_TYPE.NETWORK: + volinfo = drive.get('volumeInfo') + drive['path'] = volinfo['path'] + drive['protocol'] = volinfo['protocol'] + if drive.get('hosts') is None: + """ + THIS CODE COMMENTED OUT DUE TO A BUG IN LIBVIRT, + CANNOT WORK WITH MULTIPLE HOSTS + """ + """ + hosts = [dict(name=brick.split(":")[0], + port='0', transport='tcp') + for brick in volinfo['bricks']] + """ + hosts = [dict(name=volinfo['bricks'][0].split(":")[0], + port='0', transport='tcp')] + drive['hosts'] = hosts else: # Now we got all the resources we needed -- To view, visit https://gerrit.ovirt.org/44061 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54b81e87b959b0b49c0f06810f88410e7c75de1d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino(a)redhat.com>

5 45

Change in vdsm[master]: tests: Add basic tests for RWLock
by alitke＠redhat.com 15 Oct '16

15 Oct '16

Adam Litke has uploaded a new change for review. Change subject: tests: Add basic tests for RWLock ...................................................................... tests: Add basic tests for RWLock Change-Id: I77b9ea1cd6d378738fbf14de119c88bf0ebc94e2 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M tests/miscTests.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/42772/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index 976b503..c6d9690 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -1268,3 +1268,21 @@ def _run(self): self.result = self._func() + + +class RWLockTests(TestCaseBase): + + def test_multiple_acquire(self): + lock = misc.RWLock() + self.assertTrue(lock.acquire(exclusive=True)) + self.assertTrue(lock.acquire(exclusive=True)) + + def test_demote(self): + lock = misc.RWLock() + self.assertTrue(lock.acquire(exclusive=True)) + self.assertTrue(lock.acquire(exclusive=False)) + + def test_promote(self): + lock = misc.RWLock() + self.assertTrue(lock.acquire(False)) + self.assertRaises(RuntimeError, lock.acquire, True) -- To view, visit https://gerrit.ovirt.org/42772 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77b9ea1cd6d378738fbf14de119c88bf0ebc94e2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

4 9

Change in vdsm[master]: lvm: Fail loudly if called with unexptected input.
by Nir Soffer 15 Oct '16

15 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: lvm: Fail loudly if called with unexptected input. ...................................................................... lvm: Fail loudly if called with unexptected input. When creating pvs with the force option, we are very carefull to accept only True. When using the jsonrpc transport, engine was sending "true" and "false", causing the call to fail misteiously. Now we are also carefull about rejecting invlid input, making debugging easier. Change-Id: If9e6754d4aa2efaf894a9309cfaa4595d710063b Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/lvm.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/37329/1 diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index aa3c04b..549839a 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -724,6 +724,11 @@ else: raise + # We must be very carefull here; any value execpt True or False is a user + # error. + if type(force) != bool: + raise ValueError("Invalid value for 'force': %r" % force) + if force is True: options = ("-y", "-ff") _initpvs_removeHolders() -- To view, visit http://gerrit.ovirt.org/37329 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9e6754d4aa2efaf894a9309cfaa4595d710063b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

6 19

Change in vdsm[master]: hsm: Report vg name in getDeviceList
by Nir Soffer 08 Oct '16

08 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: hsm: Report vg name in getDeviceList ...................................................................... hsm: Report vg name in getDeviceList Hosted engine needs the iscsi session info used by the hosted engine storage domain. getDeviceList() seems to include the needed info, but it does not report the vg name for each device, making it hard to match the iscsi session info and the hosted engine storage domain. We return now the vg name of each device, which seems to be useful info regardless of hosted engine needs, and can be used on the engine side for reconstructing host state or validating engine view vs host view. Change-Id: I116714cb5143ea92f5cb54c3f80f895c07ada536 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/hsm.py 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/45823/1 diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index e0e95b9..1b2a171 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -1473,6 +1473,10 @@ # # @status: The device status (free/used/unknown) # +# @vgname: The LVM volume group name, if this device is used as +# a physical volume. This is typically a storage domain +# UUID. +# # Since: 4.10.0 # # Notes: The value of @serial may be dependent on the current host so this @@ -1490,7 +1494,8 @@ 'pathstatus': ['BlockDevicePathInfo'], 'pathlist': ['IscsiSessionInfo'], 'logicalblocksize': 'uint', 'physicalblocksize': 'uint', 'partitioned': 'bool', - 'pvsize': 'uint', 'status': 'BlockDeviceStatus'}} + 'pvsize': 'uint', 'status': 'BlockDeviceStatus', + 'vgname': 'str'}} ## # @Host.getDeviceList: diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 1b8c064..32e16c3 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2019,14 +2019,18 @@ pvuuid = pv.uuid pvsize = pv.size vguuid = pv.vg_uuid + vgname = pv.vg_name else: pvuuid = "" pvsize = "" vguuid = "" + vgname = "" devInfo = {'GUID': dev.get("guid", ""), 'pvUUID': pvuuid, 'pvsize': str(pvsize), - 'vgUUID': vguuid, 'vendorID': dev.get("vendor", ""), + 'vgUUID': vguuid, + 'vgname': vgname, + 'vendorID': dev.get("vendor", ""), 'productID': dev.get("product", ""), 'fwrev': dev.get("fwrev", ""), "serial": dev.get("serial", ""), -- To view, visit https://gerrit.ovirt.org/45823 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I116714cb5143ea92f5cb54c3f80f895c07ada536 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

7 22

Change in vdsm[master]: utils: Consider sleep time in deadline calculation
by Nir Soffer 08 Oct '16

08 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: utils: Consider sleep time in deadline calculation ...................................................................... utils: Consider sleep time in deadline calculation This patches fixes 2 utils.retry() broken tests: - The special case when deadline has reached when an operation was done. Previously we use to sleep and perform another retry, now we bail out. - The special case when deadline was not reached when an operation was done, but we don't have time for sleep (sleeping will reach or exceed the deadline). Previously we used to sleep and perform another retry, now we bail out. Change-Id: I7f41c6b21e3432159c13d46cfe75d1f6236cbb8c Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/utils.py M tests/utilsTests.py 2 files changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/46400/1 diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py index caf4cc2..4a4b153 100644 --- a/lib/vdsm/utils.py +++ b/lib/vdsm/utils.py @@ -938,10 +938,7 @@ if tries in [0, None]: tries = -1 - if timeout in [0, None]: - timeout = -1 - - startTime = monotonic_time() + deadline = monotonic_time() + timeout if timeout else None while True: tries -= 1 @@ -951,7 +948,7 @@ if tries == 0: raise - if (timeout > 0) and ((monotonic_time() - startTime) > timeout): + if deadline and monotonic_time() + sleep >= deadline: raise if stopCallback is not None and stopCallback(): diff --git a/tests/utilsTests.py b/tests/utilsTests.py index d213de5..fd4f42e 100644 --- a/tests/utilsTests.py +++ b/tests/utilsTests.py @@ -44,7 +44,7 @@ from testlib import permutations, expandPermutations from testlib import VdsmTestCase as TestCaseBase from testValidation import checkSudo -from testValidation import brokentest, stresstest +from testValidation import stresstest from multiprocessing import Process EXT_SLEEP = "sleep" @@ -86,7 +86,6 @@ # Make sure we had the proper amount of iterations before failing self.assertEquals(counter[0], limit) - @brokentest("deadline is not respected") @MonkeyPatch(utils, 'monotonic_time', FakeTime(0)) @MonkeyPatch(time, 'sleep', fake_sleep) def testTimeoutDeadlineReached(self): @@ -104,7 +103,6 @@ timeout=3, sleep=1) self.assertEqual(utils.monotonic_time.now, 3) - @brokentest("sleep is not considered in deadline calculation") @MonkeyPatch(utils, 'monotonic_time', FakeTime(0)) @MonkeyPatch(time, 'sleep', fake_sleep) def testTimeoutNoTimeForSleep(self): -- To view, visit https://gerrit.ovirt.org/46400 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f41c6b21e3432159c13d46cfe75d1f6236cbb8c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 10

Change in vdsm[master]: hsm: Pep8ize function name
by Nir Soffer 08 Oct '16

08 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: hsm: Pep8ize function name ...................................................................... hsm: Pep8ize function name Remove unneeded _private prefix for inner function and use lowercase name. Change-Id: I54715971378319a8501a49cb89b24f27e50a07f4 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/hsm.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/39306/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index a4bb858..8f75a39 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2070,7 +2070,7 @@ boolean :rtype: dict """ - def _isVisible(guid): + def is_visible(guid): path = os.path.join('/dev/mapper', guid) try: st = os.stat(path) @@ -2081,10 +2081,10 @@ else: return (st.st_mode & stat.S_IRUSR) != 0 - visibility = [_isVisible(guid) for guid in guids] + visibility = [is_visible(guid) for guid in guids] if not all(visibility): multipath.rescan() - visibility = [_isVisible(guid) for guid in guids] + visibility = [is_visible(guid) for guid in guids] visibility = dict(zip(guids, visibility)) # After multipath.rescan, existing devices may disapper, and new -- To view, visit https://gerrit.ovirt.org/39306 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54715971378319a8501a49cb89b24f27e50a07f4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 9

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches September 2015