vdsm-patches November 2012

vdsm-patches@lists.fedorahosted.org

50 participants
416 discussions

Change in vdsm[master]: configNet: support PREFIX option
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: configNet: support PREFIX option ...................................................................... configNet: support PREFIX option PREFIX=16 means NETMASK=255.255.0.0. Change-Id: I1d87818642aa2092533f4864728c5ecd5d64f740 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/9322/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 3940446..4bdb160 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -29,6 +29,8 @@ from xml.sax.saxutils import escape import glob import shutil +import socket +import struct import libvirt import selinux @@ -865,6 +867,21 @@ _validateInterNetworkCompatibility(_netinfo, vlan, nic, bridged) +def _prefix2netmask(prefix): + return socket.inet_ntoa( + struct.pack( + "!I", + int( + ( + ''.ljust(prefix, '1') + + ''.ljust(32 - prefix, '0') + ), + 2 + ) + ) + ) + + def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask=None, mtu=None, gateway=None, force=False, configWriter=None, bondingOptions=None, bridged=True, @@ -876,6 +893,15 @@ if mtu: mtu = int(mtu) + prefix = int(options.get('PREFIX')) + if prefix: + if netmask is None: + netmask = _prefix2netmask(prefix) + del options['PREFIX'] + else: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'Both PREFIX and NETMASK supplied') + # Validation if not utils.tobool(force): logging.debug('validating network...') -- To view, visit http://gerrit.ovirt.org/9322 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d87818642aa2092533f4864728c5ecd5d64f740 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

5 34

Change in vdsm[master]: confNet: report missing net params as ERR_BAD_PARAMS
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: confNet: report missing net params as ERR_BAD_PARAMS ...................................................................... confNet: report missing net params as ERR_BAD_PARAMS Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/6959/1 -- To view, visit http://gerrit.ovirt.org/6959 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 4

Change in vdsm[master]: vdsmd.init: retire ifconfig
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: vdsmd.init: retire ifconfig ...................................................................... vdsmd.init: retire ifconfig Replace ifconfig with iproute2's /sbin/ip also in our init script. Drop an old irrelevant comment that mentions ifconfig. Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/netinfo.py M vdsm/vdsmd.init.in 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/9385/1 diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py index b6d1a1f..7b28fae 100644 --- a/vdsm/netinfo.py +++ b/vdsm/netinfo.py @@ -274,9 +274,9 @@ def get(): d = {} routes = getRoutes() - # FIXME handle bridge/nic missing from ifconfig d['networks'] = {} nets = networks() + for netname in nets.iterkeys(): if nets[netname]['bridged']: devname = netname diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in index 53ad8af..e1df196 100755 --- a/vdsm/vdsmd.init.in +++ b/vdsm/vdsmd.init.in @@ -179,7 +179,7 @@ } test_lo() { - if ! LC_ALL=C /sbin/ifconfig lo | /bin/grep -q UP; + if ! LC_ALL=C /sbin/ip lo | /bin/grep -q UP; then log_failure_msg "VDSMD: lo interface is down, can't run !" echo "VDSMD: lo interface is down, can't run !" > /dev/kmsg -- To view, visit http://gerrit.ovirt.org/9385 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27385f74653b209c18aa8594b89a409287b4f259 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

5 14

Change in vdsm[master]: pep8 fixes
by lhornyak＠redhat.com 21 Nov '12

21 Nov '12

Laszlo Hornyak has uploaded a new change for review. Change subject: pep8 fixes ...................................................................... pep8 fixes fixes in the code to make vdsm build on rhel 6.3 Change-Id: Ifbbba925fa0c9be78b0eb5eb3d07066dc3b3c5ab Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M vdsm/storage/misc.py M vdsm/vm.py 2 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/9366/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..9f3d1bc 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -733,12 +733,10 @@ # keep the earliest exception info if not firstException: firstException = e - # keep the original traceback info - traceback = sys.exc_info()[2] # re-raise the earliest exception if firstException is not None: - raise firstException, None, traceback + raise firstException def defer(self, func, *args, **kwargs): self._finally.append((func, args, kwargs)) diff --git a/vdsm/vm.py b/vdsm/vm.py index e6d5947..73e3f3f 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -363,7 +363,7 @@ SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], BALLOON_DEVICES: [], REDIR_DEVICES: [], - WATCHDOG_DEVICES: [],} + WATCHDOG_DEVICES: []} def _get_lastStatus(self): PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -495,7 +495,8 @@ if not 'specParams' in devices[WATCHDOG_DEVICES][0]: devices[WATCHDOG_DEVICES][0]['specParams'] = {} if not 'model' in devices[WATCHDOG_DEVICES][0]['specParams']: - devices[WATCHDOG_DEVICES][0]['specParams']['model'] = 'i6300esb' + devices[WATCHDOG_DEVICES][0]['specParams']['model'] = \ + 'i6300esb' if not 'action' in devices[WATCHDOG_DEVICES][0]['specParams']: devices[WATCHDOG_DEVICES][0]['specParams']['action'] = 'none' -- To view, visit http://gerrit.ovirt.org/9366 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbbba925fa0c9be78b0eb5eb3d07066dc3b3c5ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com>

5 13

Change in vdsm[master]: tc: retire ifconfig
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: tc: retire ifconfig ...................................................................... tc: retire ifconfig ifconfig was deprecated quite a few years ago, and some modern distribution do not ship it by default. In this patch, we dump its only use, by setting promisc flag directly. We implement set_flags() in hope to see ethtool add it. Change-Id: Ifb4f289efb5754d7c49ac0a08e3a9adc09b12bb7 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M configure.ac M vdsm/constants.py.in M vdsm/tc.py M vdsm_reg/deployUtil.py.in 4 files changed, 30 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/9370/1 diff --git a/configure.ac b/configure.ac index 5d8b238..b8f1825 100644 --- a/configure.ac +++ b/configure.ac @@ -144,7 +144,6 @@ AC_PATH_PROG([FUSER_PATH], [fuser], [/sbin/fuser]) AC_PATH_PROG([GRUBBY_PATH], [grubby], [/sbin/grubby]) AC_PATH_PROG([HWCLOCK_PATH], [hwclock], [/usr/sbin/hwclock]) -AC_PATH_PROG([IFCONFIG_PATH], [ifconfig], [/sbin/ifconfig]) AC_PATH_PROG([IFDOWN_PATH], [ifdown], [/sbin/ifdown]) AC_PATH_PROG([IFUP_PATH], [ifup], [/sbin/ifup]) AC_PATH_PROG([IONICE_PATH], [ionice], [/usr/bin/ionice]) diff --git a/vdsm/constants.py.in b/vdsm/constants.py.in index 2e9eb99..07dd431 100644 --- a/vdsm/constants.py.in +++ b/vdsm/constants.py.in @@ -97,7 +97,6 @@ EXT_FSCK = '@FSCK_PATH@' EXT_FUSER = '@FUSER_PATH@' -EXT_IFCONFIG = '@IFCONFIG_PATH@' EXT_IFDOWN = '@IFDOWN_PATH@' EXT_IFUP = '@IFUP_PATH@' EXT_IONICE = '@IONICE_PATH@' diff --git a/vdsm/tc.py b/vdsm/tc.py index a0a612f..7630b9b 100644 --- a/vdsm/tc.py +++ b/vdsm/tc.py @@ -19,11 +19,15 @@ # from collections import namedtuple +from contextlib import closing +import ctypes +import fcntl +import socket import ethtool import storage.misc -from vdsm.constants import EXT_TC, EXT_IFCONFIG +from vdsm.constants import EXT_TC ERR_DEV_NOEXIST = 2 @@ -155,12 +159,32 @@ raise +def set_flags(dev, flags): + "Set device flags. We need this local definition until ethtool has it" + + SIOCSIFFLAGS = 0x8914 + + class ifreq(ctypes.Structure): + _fields_ = [("ifr_ifrn", ctypes.c_char * 16), + ("ifr_flags", ctypes.c_short)] + + with closing(socket.socket(socket.AF_INET, socket.SOCK_DGRAM)) as s: + ifr = ifreq() + ifr.ifr_ifrn = dev + ifr.ifr_flags = flags + + fcntl.ioctl(s.fileno(), SIOCSIFFLAGS, ifr) + + def set_promisc(dev, on=True): - promisc = 'promisc' - if not on: - promisc = '-promisc' - command = [EXT_IFCONFIG, dev, promisc] - _process_request(command) + flags = ethtool.get_flags(dev) + + if on: + flags |= ethtool.IFF_PROMISC + else: + flags &= ~ethtool.IFF_PROMISC + + set_flags(dev, flags) Filter = namedtuple('Filter', 'prio handle actions') diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index dec03c2..0fe1275 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -65,7 +65,6 @@ EX_ECHO = '@ECHO_PATH@' EX_GRUBBY = '@GRUBBY_PATH@' EX_HWCLOCK = '@HWCLOCK_PATH@' -EX_IFCONFIG = '@IFCONFIG_PATH@' EX_NTPQ = '@NTPQ_PATH@' EX_OPENSSL = '@OPENSSL_PATH@' EX_REBOOT = '@REBOOT_PATH@' -- To view, visit http://gerrit.ovirt.org/9370 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb4f289efb5754d7c49ac0a08e3a9adc09b12bb7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

6 9

Change in vdsm[master]: add a constants.py file for HSM service standalone
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

Hello Shu Ming, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9348 to review the following change. Change subject: add a constants.py file for HSM service standalone ...................................................................... add a constants.py file for HSM service standalone constants.py is installed in a separate python site-packages for hsm Remame P_VDSM_RUN as P_HSM_RUN This is one of step to make HSM service standalone wiki-page: http://wiki.ovirt.org/wiki/HSM_service_stand_alone Change-Id: I092c11d8ee022c7d2954d52352ff44ea37233f37 Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M .gitignore M build-aux/Makefile.subs M configure.ac M vdsm.spec.in M vdsm/storage/Makefile.am M vdsm/storage/blockSD.py A vdsm/storage/constants.py.in M vdsm/storage/devicemapper.py M vdsm/storage/fileSD.py M vdsm/storage/fileUtils.py M vdsm/storage/fuser.py M vdsm/storage/hsm.py M vdsm/storage/iscsi.py M vdsm/storage/iscsiadm.py M vdsm/storage/lvm.py M vdsm/storage/misc.py M vdsm/storage/mount.py M vdsm/storage/multipath.py M vdsm/storage/remoteFileHandler.py M vdsm/storage/safelease.py M vdsm/storage/sd.py M vdsm/storage/sp.py M vdsm/storage/storage_mailbox.py M vdsm/storage/volume.py 24 files changed, 172 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/9348/1 diff --git a/.gitignore b/.gitignore index b5b17e4..577453f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ vdsm/mom.conf vdsm/sos/vdsm.py vdsm/storage/config.py +vdsm/storage/constants.py vdsm/storage/protect/safelease vdsm/sudoers.vdsm vdsm/vdsm-gencerts.sh diff --git a/build-aux/Makefile.subs b/build-aux/Makefile.subs index 74b7153..5f88984 100644 --- a/build-aux/Makefile.subs +++ b/build-aux/Makefile.subs @@ -34,7 +34,8 @@ -e "s,[@]VDSMLOGDIR[@],$(vdsmlogdir),g" \ -e "s,[@]VDSMREPO[@],$(vdsmrepo),g" \ -e "s,[@]VDSMRUNDIR[@],$(vdsmrundir),g" \ - -e "s,[@]VDSMUPGRADEDIR[@],$(vdsmupgradedir),g" + -e "s,[@]VDSMUPGRADEDIR[@],$(vdsmupgradedir),g" \ + -e "s,[@]HSMRUNDIR[@],$(hsmrundir),g" CONFIGSUBST = $(top_builddir)/config.status --file=- diff --git a/configure.ac b/configure.ac index a384823..2412a01 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,8 @@ # HSM default paths AC_SUBST([hsmpylibdir], ['${pyexecdir}/hsmd']) +# FIXME: this path should be modified when HSM service standalone was done +AC_SUBST([hsmrundir], ['${localstatedir}/run/vdsm']) # VDSM registration default paths AC_SUBST([vdsmregdir], ['${datarootdir}/vdsm-reg']) diff --git a/vdsm.spec.in b/vdsm.spec.in index a9f1379..c5997e8 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -779,6 +779,7 @@ %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* %{python_sitearch}/%{hsm_name}/__init__.py* %{python_sitearch}/%{hsm_name}/config.py* +%{python_sitearch}/%{hsm_name}/constants.py* %files tests %doc %{_datadir}/%{vdsm_name}/tests/README diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 9af470e..09028a5 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -70,7 +70,8 @@ __init__.py nodist_hsmpylib_PYTHON = \ - config.py + config.py \ + constants.py nodist_noinst_DATA = \ hsm.conf.sample @@ -81,7 +82,8 @@ EXTRA_DIST = \ 12-vdsm-lvm.rules \ - config.py.in + config.py.in \ + constants.py.in hsm.conf.sample: Makefile config.py @echo " CONFIG $@"; $(PYTHON) $(builddir)/config.py > $@ diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index d59aa05..e0e2e95 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -32,7 +32,7 @@ from operator import itemgetter from hsmd.config import config -from vdsm import constants +from hsmd import constants import misc import fileUtils import sd diff --git a/vdsm/storage/constants.py.in b/vdsm/storage/constants.py.in new file mode 100644 index 0000000..292d8a5 --- /dev/null +++ b/vdsm/storage/constants.py.in @@ -0,0 +1,142 @@ +# +# Copyright 2009-2012 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 +# +# +# Description: Constants definitions for hsm and utilities. + +# +# file ownership definitions +# +DISKIMAGE_USER = '@VDSMUSER@' +DISKIMAGE_GROUP = '@QEMUGROUP@' +METADATA_USER = '@METADATAUSER@' +METADATA_GROUP = '@METADATAGROUP@' +QEMU_PROCESS_USER = '@QEMUUSER@' + +# This is the domain version translation list +# DO NOT CHANGE OLD VALUES ONLY APPEND +DOMAIN_VERSIONS = (0, 2, 3) +SUPPORTED_BLOCKSIZE = (512,) + +# This contains the domains versions that this HSM +# accepts currently its all of the version but in the +# future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) +SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS + +UUID_GLOB_PATTERN = '*-*-*-*-*' + +MEGAB = 2 ** 20 # = 1024 ** 2 = 1 MiB + +# +# Path definitions +# +P_HSM_RUN = '@HSMRUNDIR@/' + + +# +# External programs (sorted, please keep in order). +# + +EXT_CHOWN = '@CHOWN_PATH@' +EXT_CP = '@CP_PATH@' + +EXT_DD = '@DD_PATH@' +EXT_DMSETUP = '@DMSETUP_PATH@' + +EXT_FSCK = '@FSCK_PATH@' +EXT_FUSER = '@FUSER_PATH@' + +EXT_IONICE = '@IONICE_PATH@' +EXT_ISCSIADM = '@ISCSIADM_PATH@' +EXT_TC = '@TC_PATH@' + +EXT_KILL = '@KILL_PATH@' + +EXT_LSBLK = '@LSBLK_PATH@' +EXT_LVM = '@LVM_PATH@' + +EXT_MKFS = '@MKFS_PATH@' +EXT_MKFS_MSDOS = '@MKFS_MSDOS_PATH@' +EXT_MKISOFS = '@MKISOFS_PATH@' +EXT_MOUNT = '@MOUNT_PATH@' +EXT_MULTIPATH = '@MULTIPATH_PATH@' +EXT_MV = '@MV_PATH@' + +EXT_NICE = '@NICE_PATH@' + +EXT_PERSIST = '@PERSIST_PATH@' +EXT_PGREP = '@PGREP_PATH@' +EXT_PYTHON = '@PYTHON@' + +EXT_QEMUIMG = '@QEMUIMG_PATH@' + +EXT_REBOOT = '@REBOOT_PATH@' +EXT_RSYNC = '@RSYNC_PATH@' + +EXT_SCSI_ID = '@SCSI_ID_PATH@' # TBD ! +EXT_SERVICE = '@SERVICE_PATH@' +EXT_SETSID = '@SETSID_PATH@' +EXT_SH = '/bin/sh' # The shell path is invariable +EXT_SHOWMOUNT = '@SHOWMOUNT_PATH@' +EXT_SU = '@SU_PATH@' +EXT_SUDO = '@SUDO_PATH@' + +EXT_TAR = '@TAR_PATH@' +EXT_TUNE2FS = '@TUNE2FS_PATH@' + +EXT_UDEVADM = '@UDEVADM_PATH@' + +EXT_UMOUNT = '@UMOUNT_PATH@' +EXT_UNPERSIST = '@UNPERSIST_PATH@' + +EXT_IPROUTE = '@IPROUTE_PATH@' + +EXT_WGET = '@WGET_PATH@' + +CMD_LOWPRIO = [EXT_NICE, '-n', '19', EXT_IONICE, '-c', '3'] + +# +# Storage constants +# +STRG_ISCSI_HOST = "iscsi_host/" +STRG_SCSI_HOST = "scsi_host/" +STRG_ISCSI_SESSION = "iscsi_session/" +STRG_MPATH_CONF = ( +"\n\n" +"defaults {\n" +" polling_interval 5\n" +" getuid_callout \"@SCSI_ID_PATH@ --whitelisted " + "--replace-whitespace --device=/dev/%n\"\n" +" no_path_retry fail\n" +" user_friendly_names no\n" +" flush_on_last_del yes\n" +" fast_io_fail_tmo 5\n" +" dev_loss_tmo 30\n" +" max_fds 4096\n" +"}\n" +"\n" +"devices {\n" +"device {\n" +" vendor \"HITACHI\"\n" +" product \"DF.*\"\n" +" getuid_callout \"@SCSI_ID_PATH@ --whitelisted " + "--replace-whitespace --device=/dev/%n\"\n" +"}\n" +"}" +) diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py index a1651e0..c931085 100644 --- a/vdsm/storage/devicemapper.py +++ b/vdsm/storage/devicemapper.py @@ -25,7 +25,7 @@ import re from supervdsm import getProxy -from vdsm.constants import EXT_DMSETUP +from hsmd.constants import EXT_DMSETUP DMPATH_FORMAT = "/dev/mapper/%s" diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index 90ffecd..7ec3718 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -32,7 +32,7 @@ import outOfProcess as oop from remoteFileHandler import Timeout from persistentDict import PersistentDict, DictValidator -from vdsm import constants +from hsmd import constants import time import supervdsm import mount diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py index 13a8cfa..834fd3b 100644 --- a/vdsm/storage/fileUtils.py +++ b/vdsm/storage/fileUtils.py @@ -33,7 +33,7 @@ import subprocess import shutil -from vdsm import constants +from hsmd import constants import logging import errno libc = ctypes.CDLL("libc.so.6", use_errno=True) diff --git a/vdsm/storage/fuser.py b/vdsm/storage/fuser.py index d9becbc..6de3032 100644 --- a/vdsm/storage/fuser.py +++ b/vdsm/storage/fuser.py @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # import misc -from vdsm import constants +from hsmd import constants def fuser(path, mountPoint=False): diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 476eed8..8b29707 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -56,7 +56,7 @@ import safelease import storage_exception as se from threadLocal import vars -from vdsm import constants +from hsmd import constants from storageConstants import STORAGE from task import Job from resourceFactories import IMAGE_NAMESPACE @@ -84,7 +84,7 @@ # FIXME: moved from spm.py but this should be somewhere else SECTOR_SIZE = 512 -STORAGE_CONNECTION_DIR = os.path.join(constants.P_VDSM_RUN, "connections/") +STORAGE_CONNECTION_DIR = os.path.join(constants.P_HSM_RUN, "connections/") def public(f=None, **kwargs): if f is None: diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index 4723746..57dfe4a 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -30,7 +30,7 @@ import time from collections import namedtuple -from vdsm import constants +from hsmd import constants import misc from hsmd.config import config import devicemapper diff --git a/vdsm/storage/iscsiadm.py b/vdsm/storage/iscsiadm.py index 6b58d15..6182d15 100644 --- a/vdsm/storage/iscsiadm.py +++ b/vdsm/storage/iscsiadm.py @@ -1,6 +1,6 @@ from threading import Lock import misc -from vdsm import constants +from hsmd import constants # iscsiadm exit statuses ISCSI_ERR_SESS_EXISTS = 15 diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 8c77a6a..8543a26 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -37,7 +37,7 @@ from itertools import chain from subprocess import list2cmdline -from vdsm import constants +from hsmd import constants import misc import multipath import storage_exception as se @@ -120,7 +120,7 @@ } """ -VAR_RUN_VDSM = constants.P_VDSM_RUN +VAR_RUN_VDSM = constants.P_HSM_RUN VDSM_LVM_SYSTEM_DIR = os.path.join(VAR_RUN_VDSM, "lvm") VDSM_LVM_CONF = os.path.join(VDSM_LVM_SYSTEM_DIR, "lvm.conf") diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index bf3ae79..9de1e93 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -56,7 +56,7 @@ import inspect sys.path.append("../") -from vdsm import constants +from hsmd import constants import storage_exception as se from vdsm.betterPopen import BetterPopen import logUtils diff --git a/vdsm/storage/mount.py b/vdsm/storage/mount.py index 94cfae0..1659a89 100644 --- a/vdsm/storage/mount.py +++ b/vdsm/storage/mount.py @@ -24,7 +24,7 @@ import os import stat -from vdsm import constants +from hsmd import constants import misc # Common vfs types diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index c43cb09..627f2ce 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -29,7 +29,7 @@ import re from collections import namedtuple -from vdsm import constants +from hsmd import constants import misc import iscsi import supervdsm diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index edf8e68..47f4f1c 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -44,7 +44,7 @@ # don't need anything when the child spawns. Plus anything you don't have # to import is less memory taken by each helper. from vdsm.betterPopen import BetterPopen - from vdsm import constants + from hsmd import constants else: # We add the parent directory so that imports that import the storage # package would work even though CWD is inside the storage package. diff --git a/vdsm/storage/safelease.py b/vdsm/storage/safelease.py index 5184224..9ce880c 100644 --- a/vdsm/storage/safelease.py +++ b/vdsm/storage/safelease.py @@ -24,7 +24,7 @@ import subprocess import sanlock from contextlib import nested -from vdsm import constants +from hsmd import constants import storage_exception as se import threading import logging diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 52f80aa..7bfbcd3 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -30,7 +30,7 @@ import resourceFactories from resourceFactories import IMAGE_NAMESPACE, VOLUME_NAMESPACE import resourceManager as rm -from vdsm import constants +from hsmd import constants import safelease import outOfProcess as oop from persistentDict import unicodeEncoder, unicodeDecoder diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 77452e9..d3f5c82 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -32,7 +32,7 @@ from imageRepository.formatConverter import DefaultFormatConverter -from vdsm import constants +from hsmd import constants import storage_mailbox import blockSD import fileSD diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index 4743940..a14f603 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -34,7 +34,7 @@ from threadLocal import vars from threadPool import ThreadPool from storage_exception import InvalidParameterException -from vdsm import constants +from hsmd import constants __author__="ayalb" __date__ ="$Mar 9, 2009 5:25:07 PM$" diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index b97e6f3..0c854e4 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -25,7 +25,7 @@ from contextlib import contextmanager import image -from vdsm import constants +from hsmd import constants import storage_exception as se import sd from sdc import sdCache -- To view, visit http://gerrit.ovirt.org/9348 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I092c11d8ee022c7d2954d52352ff44ea37233f37 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Gerrit-Reviewer: Shu Ming <shuming(a)linux.vnet.ibm.com>

2 6

Change in vdsm[master]: move betterPopen to storage for HSM service standalone
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

ShaoHe Feng has uploaded a new change for review. Change subject: move betterPopen to storage for HSM service standalone ...................................................................... move betterPopen to storage for HSM service standalone move betterPopen to the hsm python lib This is one of step to make HSM service standalone wiki-page: http://wiki.ovirt.org/wiki/HSM_service_stand_alone Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M configure.ac M tests/betterPopenTests.py M tests/testrunner.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/storage/Makefile.am R vdsm/storage/betterPopen/.gitignore R vdsm/storage/betterPopen/Makefile.am R vdsm/storage/betterPopen/__init__.py R vdsm/storage/betterPopen/createprocess.c R vdsm/storage/betterPopen/setup.py M vdsm/storage/misc.py M vdsm/storage/remoteFileHandler.py 13 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/9356/1 diff --git a/configure.ac b/configure.ac index 2412a01..b6de932 100644 --- a/configure.ac +++ b/configure.ac @@ -218,9 +218,9 @@ vdsm_hooks/vmdisk/Makefile vdsm/Makefile vdsm_reg/Makefile - vdsm/betterPopen/Makefile vdsm/gluster/Makefile vdsm/sos/Makefile + vdsm/storage/betterPopen/Makefile vdsm/storage/Makefile vdsm/storage/imageRepository/Makefile vdsm/storage/protect/Makefile diff --git a/tests/betterPopenTests.py b/tests/betterPopenTests.py index 6347460..b48288a 100644 --- a/tests/betterPopenTests.py +++ b/tests/betterPopenTests.py @@ -28,7 +28,7 @@ if __name__ != "__main__": # This will not be available when we use this module as a subprocess - from vdsm.betterPopen import BetterPopen + from hsmd.betterPopen import BetterPopen class TestBetterPopen(TestCaseBase): diff --git a/tests/testrunner.py b/tests/testrunner.py index 596ced1..73cd629 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -235,7 +235,7 @@ sys.modules['vdsm'] = mod = vdsm() for name in ('config', 'constants', 'utils', 'define', 'netinfo', - 'SecureXMLRPCServer', 'libvirtconnection', 'betterPopen', + 'SecureXMLRPCServer', 'libvirtconnection', 'exception', 'vdscli', 'qemuImg'): sub = __import__(name, globals(), locals(), [], -1) setattr(mod, name, sub) diff --git a/vdsm.spec.in b/vdsm.spec.in index c5997e8..c1140ce 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -771,13 +771,13 @@ %{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py* %{python_sitearch}/%{vdsm_name}/utils.py* %{python_sitearch}/%{vdsm_name}/vdscli.py* -%{python_sitearch}/%{vdsm_name}/betterPopen/__init__.py* -%{python_sitearch}/%{vdsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{vdsm_name}/tool/__init__.py* %{python_sitearch}/%{vdsm_name}/tool/passwd.py* %{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* %{python_sitearch}/%{hsm_name}/__init__.py* +%{python_sitearch}/%{hsm_name}/betterPopen/__init__.py* +%{python_sitearch}/%{hsm_name}/betterPopen/createprocess.so %{python_sitearch}/%{hsm_name}/config.py* %{python_sitearch}/%{hsm_name}/constants.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 7c79036..b127168 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = sos storage betterPopen rest gluster +SUBDIRS = sos storage rest gluster include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index 09028a5..188943f 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = protect imageRepository +SUBDIRS = betterPopen protect imageRepository include $(top_srcdir)/build-aux/Makefile.subs diff --git a/vdsm/betterPopen/.gitignore b/vdsm/storage/betterPopen/.gitignore similarity index 100% rename from vdsm/betterPopen/.gitignore rename to vdsm/storage/betterPopen/.gitignore diff --git a/vdsm/betterPopen/Makefile.am b/vdsm/storage/betterPopen/Makefile.am similarity index 96% rename from vdsm/betterPopen/Makefile.am rename to vdsm/storage/betterPopen/Makefile.am index 9a14e86..b76c3db 100644 --- a/vdsm/betterPopen/Makefile.am +++ b/vdsm/storage/betterPopen/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license # -betterpopendir = $(vdsmpylibdir)/betterPopen +betterpopendir = $(hsmpylibdir)/betterPopen dist_betterpopen_PYTHON = \ __init__.py diff --git a/vdsm/betterPopen/__init__.py b/vdsm/storage/betterPopen/__init__.py similarity index 100% rename from vdsm/betterPopen/__init__.py rename to vdsm/storage/betterPopen/__init__.py diff --git a/vdsm/betterPopen/createprocess.c b/vdsm/storage/betterPopen/createprocess.c similarity index 100% rename from vdsm/betterPopen/createprocess.c rename to vdsm/storage/betterPopen/createprocess.c diff --git a/vdsm/betterPopen/setup.py b/vdsm/storage/betterPopen/setup.py similarity index 100% rename from vdsm/betterPopen/setup.py rename to vdsm/storage/betterPopen/setup.py diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 9de1e93..ea874df 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -58,7 +58,7 @@ sys.path.append("../") from hsmd import constants import storage_exception as se -from vdsm.betterPopen import BetterPopen +from hsmd.betterPopen import BetterPopen import logUtils diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py index 47f4f1c..d28ef23 100644 --- a/vdsm/storage/remoteFileHandler.py +++ b/vdsm/storage/remoteFileHandler.py @@ -43,7 +43,7 @@ # If you don't have the vdsm package installed this will fail. Luckily we # don't need anything when the child spawns. Plus anything you don't have # to import is less memory taken by each helper. - from vdsm.betterPopen import BetterPopen + from hsmd.betterPopen import BetterPopen from hsmd import constants else: # We add the parent directory so that imports that import the storage -- To view, visit http://gerrit.ovirt.org/9356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide9c63ec0072d44c717dd78e8613352b5e3e5e12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

2 6

Change in vdsm[master]: split config file for HSM service standalone
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

Hello Shu Ming, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9345 to review the following change. Change subject: split config file for HSM service standalone ...................................................................... split config file for HSM service standalone Split config.py of vdsm, irs section was moved to hsm config.py Create a separate python site-packages for hsm config.py Split vdsm.conf, irs section was moved to hsm.conf The hsm.conf was still install in the vdsm config path The hsm.conf.sample was still install in the vdsm doc patch In order to run the locole test, hackVdsmModule of testrunner This is one of step to make HSM service standalone wiki-page: http://wiki.ovirt.org/wiki/HSM_service_stand_alone Change-Id: I8f62a4108275a1295f122025973a767f79b75780 Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M .gitignore M configure.ac M tests/testrunner.py M vdsm.spec.in M vdsm/clientIF.py M vdsm/config.py.in M vdsm/libvirtvm.py M vdsm/storage/Makefile.am M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py A vdsm/storage/config.py.in M vdsm/storage/dispatcher.py M vdsm/storage/domainMonitor.py M vdsm/storage/fileVolume.py M vdsm/storage/hsm.py M vdsm/storage/image.py M vdsm/storage/iscsi.py M vdsm/storage/lvm.py M vdsm/storage/outOfProcess.py M vdsm/storage/resourceFactories.py M vdsm/storage/safelease.py M vdsm/storage/sd.py M vdsm/storage/sdc.py M vdsm/storage/sp.py M vdsm/storage/storage_mailbox.py M vdsm/storage/task.py M vdsm/storage/taskManager.py M vdsm/supervdsmServer.py M vdsm/utils.py M vdsm/vm.py 30 files changed, 217 insertions(+), 120 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/9345/1 diff --git a/.gitignore b/.gitignore index 49a78ef..b5b17e4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ vdsm/mk_sysprep_floppy vdsm/mom.conf vdsm/sos/vdsm.py +vdsm/storage/config.py vdsm/storage/protect/safelease vdsm/sudoers.vdsm vdsm/vdsm-gencerts.sh diff --git a/configure.ac b/configure.ac index 7cb12ef..a384823 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,9 @@ AC_SUBST([vdsmtooldir], ['${vdsmpylibdir}/tool']) AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests']) +# HSM default paths +AC_SUBST([hsmpylibdir], ['${pyexecdir}/hsmd']) + # VDSM registration default paths AC_SUBST([vdsmregdir], ['${datarootdir}/vdsm-reg']) AC_SUBST([vdsmbootstrapdir], ['${datarootdir}/vdsm-bootstrap']) diff --git a/tests/testrunner.py b/tests/testrunner.py index 9851f3e..596ced1 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -228,6 +228,10 @@ def hackVdsmModule(): + # this hack should be removed after the hsm service standalone was done + sub = __import__('storage', globals(), locals(), [], -1) + sys.modules['hsmd'] = sub + sys.modules['vdsm'] = mod = vdsm() for name in ('config', 'constants', 'utils', 'define', 'netinfo', diff --git a/vdsm.spec.in b/vdsm.spec.in index c117ee5..a9f1379 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1,5 +1,6 @@ # Packages names %global vdsm_name vdsm +%global hsm_name hsmd %global vdsm_bootstrap vdsm-bootstrap %global vdsm_reg vdsm-reg @@ -403,6 +404,8 @@ # Install the configuration sample install -Dm 0644 vdsm/vdsm.conf.sample \ %{buildroot}%{_sysconfdir}/vdsm/vdsm.conf +install -Dm 0644 vdsm/storage/hsm.conf.sample \ + %{buildroot}%{_sysconfdir}/vdsm/hsm.conf # Install the systemd scripts install -Dm 0755 vdsm/vdsmd.init %{buildroot}/lib/systemd/systemd-vdsmd @@ -589,6 +592,7 @@ %files %defattr(-, root, root, -) %doc COPYING README vdsm/vdsm.conf.sample +%doc COPYING README vdsm/storage/hsm.conf.sample %if 0%{?rhel} %{_initrddir}/vdsmd %else @@ -754,6 +758,7 @@ %{_bindir}/vdsm-tool %if !0%{?rhel} %config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf +%config(noreplace) %{_sysconfdir}/%{vdsm_name}/hsm.conf %endif %{python_sitearch}/%{vdsm_name}/__init__.py* %{python_sitearch}/%{vdsm_name}/config.py* @@ -772,6 +777,8 @@ %{python_sitearch}/%{vdsm_name}/tool/passwd.py* %{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py* %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py* +%{python_sitearch}/%{hsm_name}/__init__.py* +%{python_sitearch}/%{hsm_name}/config.py* %files tests %doc %{_datadir}/%{vdsm_name}/tests/README diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index ed2a3c1..481f0d1 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -28,6 +28,7 @@ from storage.dispatcher import Dispatcher from storage.hsm import HSM from vdsm.config import config +from hsmd.config import config as hsmconfig import ksm from momIF import MomThread from vdsm import netinfo @@ -238,7 +239,7 @@ def _initIRS(self): self.irs = None - if config.getboolean('irs', 'irs_enable'): + if hsmconfig.getboolean('irs', 'irs_enable'): try: self.irs = Dispatcher(HSM()) except: diff --git a/vdsm/config.py.in b/vdsm/config.py.in index 038d9bd..49fd3a2 100644 --- a/vdsm/config.py.in +++ b/vdsm/config.py.in @@ -152,98 +152,6 @@ ]), - # Section: [irs] - ('irs', [ - - ('irs_enable', 'true', None), - - ('repository', '@VDSMREPO@', - 'Image repository.'), - - ('hsm_tasks', '%(repository)s/hsm-tasks', None), - - ('images', '/images', None), - - ('irsd', '%(images)s/irsd', None), - - ('images_check_times', '0', - 'Image repository check period (seconds).'), - - ('volume_utilization_percent', '50', None), - - ('volume_utilization_chunk_mb', '1024', None), - - ('vol_size_sample_interval', '60', - 'How often should the volume size be checked (seconds).'), - - ('sd_validate_timeout', '80', - 'Storage domain validate timeout, the maximum number of seconds ' - 'to wait until all the domains will be validated.'), - - ('scsi_rescan_minimal_timeout', '2', - 'The minimum number of seconds to wait for scsi scan to return.'), - - ('scsi_rescan_maximal_timeout', '30', - 'The maximal number of seconds to wait for scsi scan to return.'), - - ('sd_health_check_delay', '10', - 'Storage domain health check delay, the amount of seconds to ' - 'wait between two successive run of the domain health check.'), - - ('nfs_mount_options', 'soft,nosharecache', - 'NFS mount options, comma-separated list (NB: no white space ' - 'allowed!)'), - - ('pools_data_dir', '@POOLSDIR@', None), - - ('vol_extend_policy', 'ON', None), - - ('lock_util_path', '@LIBEXECDIR@', None), - - ('lock_cmd', 'spmprotect.sh', None), - - ('free_lock_cmd', 'spmstop.sh', None), - - ('thread_pool_size', '10', None), - - ('max_tasks', '500', None), - - ('lvm_dev_whitelist', '', None), - - ('md_backup_versions', '30', None), - - ('md_backup_dir', '@BACKUPDIR@', None), - - ('maximum_allowed_pvs', '8', - 'The number of PVs per VG has a hard-coded limit of 10.'), - - ('repo_stats_cache_refresh_timeout', '300', None), - - ('task_resource_default_timeout', '120000', None), - - ('prepare_image_timeout', '600000', None), - - ('gc_blocker_force_collect_interval', '60', None), - - ('maximum_domains_in_pool', '100', - 'Process pool configuration.'), - - ('process_pool_size', '100', None), - - ('process_pool_timeout', '60', None), - - ('process_pool_grace_period', '2', None), - - ('process_pool_max_slots_per_domain', '10', None), - - ('iscsi_default_ifaces', 'default', - 'Comma seperated ifaces to connect with. ' - 'i.e. iser,default'), - - ('use_volume_leases', 'false', - 'Whether to use the volume leases or not.'), - ]), - # Section: [addresses] ('addresses', [ diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index ca31a43..524eb81 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -32,6 +32,7 @@ import libvirtev from vdsm import libvirtconnection from vdsm.config import config +from hsmd.config import config as hsmconfig import hooks import caps from vdsm import netinfo @@ -67,7 +68,7 @@ self.updateVolumes = ( utils.AdvancedStatsFunction( self._updateVolumes, - config.getint('irs', 'vol_size_sample_interval'))) + hsmconfig.getint('irs', 'vol_size_sample_interval'))) self.sampleCpu = ( utils.AdvancedStatsFunction( @@ -1198,8 +1199,8 @@ # TODO find a better idea how to calculate this constant only after # config is initialized self._MIN_DISK_REMAIN = \ - ((100 - config.getint('irs', 'volume_utilization_percent')) * - config.getint('irs', 'volume_utilization_chunk_mb') * + ((100 - hsmconfig.getint('irs', 'volume_utilization_percent')) * + hsmconfig.getint('irs', 'volume_utilization_chunk_mb') * 2 ** 20 / 100) self._lastXMLDesc = '<domain><uuid>%s</uuid></domain>' % self.id self._devXmlHash = '0' diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am index cff09be..9af470e 100644 --- a/vdsm/storage/Makefile.am +++ b/vdsm/storage/Makefile.am @@ -20,6 +20,8 @@ SUBDIRS = protect imageRepository +include $(top_srcdir)/build-aux/Makefile.subs + vdsmstoragedir = $(vdsmdir)/storage dist_vdsmstorage_PYTHON = \ __init__.py \ @@ -64,8 +66,29 @@ threadPool.py \ volume.py +dist_hsmpylib_PYTHON = \ + __init__.py + +nodist_hsmpylib_PYTHON = \ + config.py + +nodist_noinst_DATA = \ + hsm.conf.sample + +CLEANFILES = \ + $(nodist_noinst_DATA) \ + $(nodist_hsmpylib_PYTHON) + EXTRA_DIST = \ - 12-vdsm-lvm.rules + 12-vdsm-lvm.rules \ + config.py.in + +hsm.conf.sample: Makefile config.py + @echo " CONFIG $@"; $(PYTHON) $(builddir)/config.py > $@ + +all-local: \ + $(nodist_noinst_DATA) \ + $(nodist_hsmpylib_PYTHON) check-local: PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(srcdir)/storage_exception.py diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 26d4380..d59aa05 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -31,7 +31,7 @@ from collections import namedtuple from operator import itemgetter -from vdsm.config import config +from hsmd.config import config from vdsm import constants import misc import fileUtils diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 98c471b..aaed6c5 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -22,7 +22,7 @@ import threading import sanlock -from vdsm.config import config +from hsmd.config import config import storage_exception as se import volume import image diff --git a/vdsm/storage/config.py.in b/vdsm/storage/config.py.in new file mode 100644 index 0000000..160c022 --- /dev/null +++ b/vdsm/storage/config.py.in @@ -0,0 +1,148 @@ +# +# Copyright 2011 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 +import textwrap +import ConfigParser + +parameters = [ + # Section: [irs] + ('irs', [ + + ('irs_enable', 'true', None), + + ('repository', '@VDSMREPO@', + 'Image repository.'), + + ('hsm_tasks', '%(repository)s/hsm-tasks', None), + + ('images', '/images', None), + + ('irsd', '%(images)s/irsd', None), + + ('images_check_times', '0', + 'Image repository check period (seconds).'), + + ('volume_utilization_percent', '50', None), + + ('volume_utilization_chunk_mb', '1024', None), + + ('vol_size_sample_interval', '60', + 'How often should the volume size be checked (seconds).'), + + ('sd_validate_timeout', '80', + 'Storage domain validate timeout, the maximum number of seconds ' + 'to wait until all the domains will be validated.'), + + ('scsi_rescan_minimal_timeout', '2', + 'The minimum number of seconds to wait for scsi scan to return.'), + + ('scsi_rescan_maximal_timeout', '30', + 'The maximal number of seconds to wait for scsi scan to return.'), + + ('sd_health_check_delay', '10', + 'Storage domain health check delay, the amount of seconds to ' + 'wait between two successive run of the domain health check.'), + + ('nfs_mount_options', 'soft,nosharecache', + 'NFS mount options, comma-separated list (NB: no white space ' + 'allowed!)'), + + ('pools_data_dir', '@POOLSDIR@', None), + + ('vol_extend_policy', 'ON', None), + + ('lock_util_path', '@LIBEXECDIR@', None), + + ('lock_cmd', 'spmprotect.sh', None), + + ('free_lock_cmd', 'spmstop.sh', None), + + ('thread_pool_size', '10', None), + + ('max_tasks', '500', None), + + ('lvm_dev_whitelist', '', None), + + ('md_backup_versions', '30', None), + + ('md_backup_dir', '@BACKUPDIR@', None), + + ('maximum_allowed_pvs', '8', + 'The number of PVs per VG has a hard-coded limit of 10.'), + + ('repo_stats_cache_refresh_timeout', '300', None), + + ('task_resource_default_timeout', '120000', None), + + ('prepare_image_timeout', '600000', None), + + ('gc_blocker_force_collect_interval', '60', None), + + ('maximum_domains_in_pool', '100', + 'Process pool configuration.'), + + ('process_pool_size', '100', None), + + ('process_pool_timeout', '60', None), + + ('process_pool_grace_period', '2', None), + + ('process_pool_max_slots_per_domain', '10', None), + + ('iscsi_default_ifaces', 'default', + 'Comma seperated ifaces to connect with. ' + 'i.e. iser,default'), + + ('use_volume_leases', 'false', + 'Whether to use the volume leases or not.'), + ]), +] + + +def __prepare_config(): + global config + + for section, keylist in parameters: + config.add_section(section) + for key, value, comment in keylist: + config.set(section, key, value) + +def print_config(): + twp = textwrap.TextWrapper(initial_indent='# ', subsequent_indent='# ') + + print twp.fill("HSM Sample Configuration") + print + + for section, keylist in parameters: + print "[%s]\n" % section + + for key, value, comment in keylist: + if comment: + print twp.fill(comment) + print twp.fill("%s = %s" % (key, value)) + print + +config = ConfigParser.ConfigParser() +__prepare_config() +config.read([os.path.join('@CONFDIR@', 'hsm.conf')]) + +if __name__ == '__main__': + print_config() diff --git a/vdsm/storage/dispatcher.py b/vdsm/storage/dispatcher.py index 7b2ba83..3e27803 100644 --- a/vdsm/storage/dispatcher.py +++ b/vdsm/storage/dispatcher.py @@ -19,7 +19,7 @@ # import logging -from vdsm.config import config +from hsmd.config import config import task import storage_exception as se diff --git a/vdsm/storage/domainMonitor.py b/vdsm/storage/domainMonitor.py index 6f333ee..858a450 100644 --- a/vdsm/storage/domainMonitor.py +++ b/vdsm/storage/domainMonitor.py @@ -24,7 +24,7 @@ import logging import misc -from vdsm.config import config +from hsmd.config import config from sdc import sdCache diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index d36b6fb..2bf41cc 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -23,7 +23,7 @@ import sanlock import storage_exception as se -from vdsm.config import config +from hsmd.config import config from sdc import sdCache import outOfProcess as oop import volume diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 4d696bf..476eed8 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -37,7 +37,7 @@ import math import stat -from vdsm.config import config +from hsmd.config import config import sp import sd import blockSD diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 4cd9785..174f9b7 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -29,7 +29,7 @@ import sd import misc import fileUtils -from vdsm.config import config +from hsmd.config import config import storage_exception as se import task from threadLocal import vars diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index a0c3067..4723746 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -32,7 +32,7 @@ from vdsm import constants import misc -from vdsm.config import config +from hsmd.config import config import devicemapper from threading import RLock diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index b3abc2c..8c77a6a 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -41,7 +41,7 @@ import misc import multipath import storage_exception as se -from vdsm.config import config +from hsmd.config import config import devicemapper log = logging.getLogger("Storage.LVM") diff --git a/vdsm/storage/outOfProcess.py b/vdsm/storage/outOfProcess.py index c0d85d4..71ec11a 100644 --- a/vdsm/storage/outOfProcess.py +++ b/vdsm/storage/outOfProcess.py @@ -19,7 +19,7 @@ # import types -from vdsm.config import config +from hsmd.config import config import threading from functools import partial diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py index 02aba0f..f7225a0 100644 --- a/vdsm/storage/resourceFactories.py +++ b/vdsm/storage/resourceFactories.py @@ -19,7 +19,7 @@ # import os -from vdsm.config import config +from hsmd.config import config import logging import lvm import resourceManager as rm diff --git a/vdsm/storage/safelease.py b/vdsm/storage/safelease.py index 88a4eae..5184224 100644 --- a/vdsm/storage/safelease.py +++ b/vdsm/storage/safelease.py @@ -19,7 +19,7 @@ # import os -from vdsm.config import config +from hsmd.config import config import misc import subprocess import sanlock diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 17b6ada..52f80aa 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -35,7 +35,7 @@ import outOfProcess as oop from persistentDict import unicodeEncoder, unicodeDecoder -from vdsm.config import config +from hsmd.config import config DOMAIN_MNT_POINT = 'mnt' DOMAIN_META_DATA = 'dom_md' diff --git a/vdsm/storage/sdc.py b/vdsm/storage/sdc.py index f2f4534..816f95b 100644 --- a/vdsm/storage/sdc.py +++ b/vdsm/storage/sdc.py @@ -24,7 +24,7 @@ """ import logging import threading -from vdsm.config import config +from hsmd.config import config import multipath import lvm diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index c9489b8..77452e9 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -39,7 +39,7 @@ import sd import misc import fileUtils -from vdsm.config import config +from hsmd.config import config from sdc import sdCache import storage_exception as se from persistentDict import DictValidator, unicodeEncoder, unicodeDecoder diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index f678a04..4743940 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -27,7 +27,7 @@ import logging import uuid -from vdsm.config import config +from hsmd.config import config import sd import misc import task diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py index a596494..0ea8a4b 100644 --- a/vdsm/storage/task.py +++ b/vdsm/storage/task.py @@ -56,7 +56,7 @@ import resourceManager from threadLocal import vars from weakref import proxy -from vdsm.config import config +from hsmd.config import config import outOfProcess as oop from logUtils import SimpleLogAdapter diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py index 3bc12f3..6ce82f2 100644 --- a/vdsm/storage/taskManager.py +++ b/vdsm/storage/taskManager.py @@ -21,7 +21,7 @@ import os import logging -from vdsm.config import config +from hsmd.config import config import storage_exception as se from task import Task, Job, TaskCleanType from threadPool import ThreadPool diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index a1bf8e6..39ff023 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -50,7 +50,7 @@ from storage.devicemapper import _removeMapping, _getPathsStatus import storage.misc import configNetwork -from vdsm.config import config +from hsmd.config import config as hsmconfig import tc import ksm import mkimage @@ -62,7 +62,7 @@ _UDEV_RULE_FILE_NAME = _UDEV_RULE_FILE_DIR + _UDEV_RULE_FILE_PREFIX + \ "%s-%s" + _UDEV_RULE_FILE_EXT -RUN_AS_TIMEOUT = config.getint("irs", "process_pool_timeout") +RUN_AS_TIMEOUT = hsmconfig.getint("irs", "process_pool_timeout") class Timeout(RuntimeError): diff --git a/vdsm/utils.py b/vdsm/utils.py index b4614e7..9d07ce7 100644 --- a/vdsm/utils.py +++ b/vdsm/utils.py @@ -43,7 +43,7 @@ import ethtool import constants -from config import config +from hsmd.config import config as hsmconfig _THP_STATE_PATH = '/sys/kernel/mm/transparent_hugepage/enabled' if not os.path.exists(_THP_STATE_PATH): @@ -644,7 +644,7 @@ class ImagePathStatus(threading.Thread): def __init__(self, cif, interval=None): if interval is None: - interval = config.getint('irs', 'images_check_times') + interval = hsmconfig.getint('irs', 'images_check_times') self._interval = interval self._cif = cif self.storageDomains = {} diff --git a/vdsm/vm.py b/vdsm/vm.py index 7a421bf..af681ed 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -30,6 +30,7 @@ from vdsm import utils from vdsm.define import NORMAL, ERROR, doneCode, errCode from vdsm.config import config +from hsmd.config import config as hsmconfig import kaxmlrpclib from logUtils import SimpleLogAdapter import libvirt @@ -800,7 +801,7 @@ if newSize is None: # newSize is always in megabytes - newSize = (config.getint('irs', 'volume_utilization_chunk_mb') + + newSize = (hsmconfig.getint('irs', 'volume_utilization_chunk_mb') + ((vmDrive.apparentsize + constants.MEGAB - 1) / constants.MEGAB)) -- To view, visit http://gerrit.ovirt.org/9345 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f62a4108275a1295f122025973a767f79b75780 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Gerrit-Reviewer: Shu Ming <shuming(a)linux.vnet.ibm.com>

3 8

Change in vdsm[master]: PEP 8: fix "E302 expected 2 blank lines" in tests/apiTests.p...
by zhshzhou＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

Zhou Zheng Sheng has uploaded a new change for review. Change subject: PEP 8: fix "E302 expected 2 blank lines" in tests/apiTests.py ...................................................................... PEP 8: fix "E302 expected 2 blank lines" in tests/apiTests.py On my pep8 version 1.3.3, it reports error on this file and fails the build. The patch fixes this. Change-Id: I27608d7d00c7d8e72a043eba387cd4e9f03fa837 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M tests/apiTests.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/9346/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index 4b1a56b..ff0a785 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -156,6 +156,7 @@ raise server.start() + class APITest(TestCaseBase): def expectAPI(self, obj, meth, retval): global _fakeret -- To view, visit http://gerrit.ovirt.org/9346 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27608d7d00c7d8e72a043eba387cd4e9f03fa837 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

3 8

Change in vdsm[master]: Added an option to create a watchdog device.
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

ShaoHe Feng has uploaded a new change for review. Change subject: Added an option to create a watchdog device. ...................................................................... Added an option to create a watchdog device. A support for a watchdog device was added to the "devices" configuration. Also add the watchdog event callback. model of watchdog: 'i6300esb' default model, emulating a PCI Intel 6300ESB 'ib700' emulating an ISA iBase IB700 action of watchdog: 'reset' default, forcefully reset the guest 'shutdown' gracefully shutdown the guest (not recommended) 'poweroff' forcefully power off the guest 'pause' pause the guest 'none' do nothing 'dump' automatically dump the guest The watchdog device can used to detect guest crash, and if choose 'dump' action, the libvirt will dump the guest automatically. The directory to save dump files can be configured by auto_dump_path in file /etc/libvirt/qemu.conf. The watchdog device requires an additional driver and management daemon in the guest. Just enabling the watchdog in the vdsm "devices" configuration does not do anything useful on its own. Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm/libvirtconnection.py M vdsm/libvirtev.py M vdsm/libvirtvm.py M vdsm/vm.py 4 files changed, 102 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/7535/1 diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py index e525996..25e2494 100644 --- a/vdsm/libvirtconnection.py +++ b/vdsm/libvirtconnection.py @@ -63,6 +63,12 @@ elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB: path, type, status = args[:-1] v._onBlockJobEvent(path, type, status) + elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG: + wdargs = args[:-1] + action = libvirtev.watchdogActionToString(wdargs[0]) + cif.log.debug("watchdog event: Domain %s(%s). Action: %s", + dom.name(), dom.ID(), action) + v._onWatchdogEvent(dom.name(), dom.ID(), action) else: v.log.warning('unknown eventid %s args %s', eventid, args) except: @@ -118,7 +124,8 @@ libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, - libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB): + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): conn.domainEventRegisterAny(None, ev, __eventCallback, (cif, ev)) for name in dir(libvirt.virConnect): diff --git a/vdsm/libvirtev.py b/vdsm/libvirtev.py index 92a7a0e..b12b916 100644 --- a/vdsm/libvirtev.py +++ b/vdsm/libvirtev.py @@ -444,6 +444,16 @@ return eventStrings[event] +def watchdogActionToString(action): + actionStrings = ("No action, watchdog ignored", + "Guest CPUs are paused", + "Guest CPUs are reset", + "Guest is forcably powered off", + "Guest is requested to gracefully shutdown", + "No action, a debug message logged") + return actionStrings[action] + + def myDomainEventCallback1(conn, dom, event, detail, opaque): print ("myDomainEventCallback1 EVENT: Domain %s(%s) %s %d" % (dom.name(), dom.ID(), eventToString(event), detail)) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index e95e94b..cc75d78 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1188,6 +1188,20 @@ m.setAttribute('model', self.specParams['model']) return m +class WatchdogDevice(LibvirtVmDevice): + def getXML(self): + """ + Create domxml for a watchdog device. + + <watchdog model='i6300esb' action='dump'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </watchdog> + """ + m = self.createXmlElem(self.type, None, ['address']) + m.setAttribute('model', self.specParams['model']) + if 'action' in self.specParams: + m.setAttribute('action', self.specParams['action']) + return m class RedirDevice(LibvirtVmDevice): def getXML(self): @@ -1331,6 +1345,7 @@ self._getUnderlyingVideoDeviceInfo() self._getUnderlyingControllerDeviceInfo() self._getUnderlyingBalloonDeviceInfo() + self._getUnderlyingWatchdogDeviceInfo() # Obtain info of all unknown devices. Must be last! self._getUnderlyingUnknownDeviceInfo() @@ -1420,6 +1435,7 @@ vm.CONTROLLER_DEVICES: ControllerDevice, vm.GENERAL_DEVICES: GeneralDevice, vm.BALLOON_DEVICES: BalloonDevice, + vm.WATCHDOG_DEVICES: WatchdogDevice, vm.REDIR_DEVICES: RedirDevice} for devType, devClass in devMap.items(): @@ -2031,6 +2047,10 @@ self.saveState() + def _onWatchdogEvent(self, name, vmid, action): + self.log.debug("Watchdog event comes from guest %s(%s). " + "Action: %s", name, vmid, action) + def changeCD(self, drivespec): return self._changeBlockDev('cdrom', 'hdc', drivespec) @@ -2374,6 +2394,38 @@ dev['address'] = address dev['alias'] = alias + def _getUnderlyingWatchdogDeviceInfo(self): + """ + Obtain watchdog device info from libvirt. + """ + watchdogxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ + getElementsByTagName('devices')[0]. \ + getElementsByTagName('watchdog') + for x in watchdogxml: + action = x.getAttribute('action') + # Ignore watchdog device without address. + if not x.getElementsByTagName('address'): + continue + + address = self._getUnderlyingDeviceAddress(x) + alias = x.getElementsByTagName('alias')[0].getAttribute('name') + + for dev in self._devices[vm.WATCHDOG_DEVICES]: + if not hasattr(dev, 'address'): + dev.address = address + dev.alias = alias + if not "action" in dev.specParams: + dev.specParams['action'] = action + + for dev in self.conf['devices']: + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not dev.get('address')): + dev['address'] = address + dev['alias'] = alias + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not "action" in dev['specParams']): + dev['specParams']['action'] = action + def _getUnderlyingVideoDeviceInfo(self): """ Obtain video devices info from libvirt. diff --git a/vdsm/vm.py b/vdsm/vm.py index 949a3ee..d24d1a4 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -45,6 +45,7 @@ GENERAL_DEVICES = 'general' BALLOON_DEVICES = 'balloon' REDIR_DEVICES = 'redir' +WATCHDOG_DEVICES = 'watchdog' """ A module containing classes needed for VM communication. @@ -310,7 +311,8 @@ self._devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: [],} def _get_lastStatus(self): SHOW_PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -381,11 +383,24 @@ 'index': 0, 'truesize': 0}) return removables + def _removeRedundantDevices(self, devices): + counters = 0 + for dev in self.conf['devices']: + if (dev['type'] == devices): + counters += 1 + if (counters > 1): + self.conf['devices'].remove(dev) + if (counters > 1): + self.log.warning("%d redundant %s devices are removed", + counters-1, devices) + return counters + def getConfDevices(self): devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: []} for dev in self.conf.get('devices'): try: devices[dev['type']].append(dev) @@ -417,8 +432,23 @@ devices[CONTROLLER_DEVICES] = self.getConfController() devices[GENERAL_DEVICES] = [] devices[BALLOON_DEVICES] = [] + devices[WATCHDOG_DEVICES] = [] devices[REDIR_DEVICES] = [] else: + # libvirt only support one watchdog device + # before getting devices list, check WATCHDOG_DEVICES and + # try to remove redundant watchdog devices + self._removeRedundantDevices(WATCHDOG_DEVICES) + # must assign the model for watchdog device to libvirt + # but the action can be assigned default by libvirt + # so ignore the action + for dev in self.conf['devices']: + if (dev['type'] == WATCHDOG_DEVICES): + if not 'specParams' in dev: + dev['specParams'] = {} + if not 'model' in dev['specParams']: + dev['specParams']['model'] = 'i6300esb' + devices = self.getConfDevices() # Normalize vdsm images -- To view, visit http://gerrit.ovirt.org/7535 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

12 35

← Newer
1
...
30
31
32
33
34
35
36
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2012