vdsm-patches November 2013

vdsm-patches@lists.fedorahosted.org

60 participants
580 discussions

Change in vdsm[master]: configuring selinux allowing kemu-kvm to generate coredump.
by mtayer＠redhat.com 07 Nov '13

07 Nov '13

mooli tayer has uploaded a new change for review. Change subject: configuring selinux allowing kemu-kvm to generate coredump. ...................................................................... configuring selinux allowing kemu-kvm to generate coredump. Change-Id: Ia22181fe0c60ccab1cc8004213e216292ccc8283 Signed-off-by: Mooli Tayer <mtayer(a)redhat.com> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/20705/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 34bdc2d..fa6698c 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -648,6 +648,9 @@ if [ "$1" -eq 1 ] ; then /sbin/chkconfig --add vdsmd /sbin/chkconfig --add supervdsmd + # allow creation of core dumps by quemu-kvm + /usr/sbin/semanage fcontext -a -t virt_cache_t '/var/log/core(/.*)?' + /sbin/restorecon /var/log/core fi %else %if 0%{?with_systemd} -- To view, visit http://gerrit.ovirt.org/20705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia22181fe0c60ccab1cc8004213e216292ccc8283 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer <mtayer(a)redhat.com>

4 14

Change in vdsm[master]: Revert "sampling.ImagePathStatus: drop unused code"
by Federico Simoncelli 07 Nov '13

07 Nov '13

Federico Simoncelli has uploaded a new change for review. Change subject: Revert "sampling.ImagePathStatus: drop unused code" ...................................................................... Revert "sampling.ImagePathStatus: drop unused code" This reverts commit 8086bf15e11d7e7cec26ba33cfccc95448214e01. Change-Id: I5502264af5278d8568e9a51360598c39e28e05ef Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M lib/vdsm/config.py.in M vdsm/clientIF.py M vdsm/sampling.py M vdsm_api/vdsmapi-schema.json 4 files changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/21013/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index c8ce7e6..c0bdd53 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -194,6 +194,9 @@ ('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), diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 7c3a0ea..0b67e45 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -83,7 +83,7 @@ self.gluster = None try: self.vmContainer = {} - self._hostStats = sampling.HostStatsThread(log=log) + self._hostStats = sampling.HostStatsThread(cif=self, log=log) self._hostStats.start() self.lastRemoteAccess = 0 self._memLock = threading.Lock() diff --git a/vdsm/sampling.py b/vdsm/sampling.py index 06b0b50..09e3dd4 100644 --- a/vdsm/sampling.py +++ b/vdsm/sampling.py @@ -36,6 +36,7 @@ from vdsm import utils from vdsm import netinfo from vdsm.constants import P_VDSM_RUN +from vdsm.config import config _THP_STATE_PATH = '/sys/kernel/mm/transparent_hugepage/enabled' if not os.path.exists(_THP_STATE_PATH): @@ -364,7 +365,7 @@ AVERAGING_WINDOW = 5 SAMPLE_INTERVAL_SEC = 2 - def __init__(self, log): + def __init__(self, cif, log): self.startTime = time.time() threading.Thread.__init__(self) @@ -376,10 +377,12 @@ self._lineRate = (sum(self._ifrates) or 1000) * (10 ** 6) / 8 self._lastSampleTime = time.time() + self._imagesStatus = ImagePathStatus(cif) self._pid = os.getpid() self._ncpus = max(os.sysconf('SC_NPROCESSORS_ONLN'), 1) def stop(self): + self._imagesStatus.stop() self._stopEvent.set() def _updateIfidsIfrates(self): @@ -415,7 +418,19 @@ def get(self): stats = self._getInterfacesStats() stats['cpuSysVdsmd'] = stats['cpuUserVdsmd'] = 0.0 + stats['storageDomains'] = {} + if self._imagesStatus._cif.irs: + self._imagesStatus._refreshStorageDomains() now = time.time() + for sd, d in self._imagesStatus.storageDomains.iteritems(): + stats['storageDomains'][sd] = { + 'code': d['code'], + 'delay': d['delay'], + 'lastCheck': d['lastCheck'], + 'valid': d['valid'], + 'version': d['version'], + 'acquired': d['acquired'], + } stats['elapsedTime'] = int(now - self.startTime) if len(self._samples) < 2: return stats @@ -504,7 +519,41 @@ stats['txRate'] = min(stats['txRate'], 100.0) stats['rxRate'] = min(stats['rxRate'], 100.0) logging.debug(stats) +# stats['rxBps'] = float(rx) / interval +# stats['txBps'] = float(tx) / interval stats['rxDropped'] = rxDropped stats['txDropped'] = txDropped return stats + + +class ImagePathStatus(threading.Thread): + def __init__(self, cif, interval=None): + if interval is None: + interval = config.getint('irs', 'images_check_times') + self._interval = interval + self._cif = cif + self.storageDomains = {} + self._stopEvent = threading.Event() + threading.Thread.__init__(self, name='ImagePathStatus') + if self._interval > 0: + self.start() + + def stop(self): + self._stopEvent.set() + + def _refreshStorageDomains(self): + self.storageDomains = self._cif.irs.repoStats() + del self.storageDomains["status"] + if "args" in self.storageDomains: + del self.storageDomains["args"] + + def run(self): + try: + while not self._stopEvent.isSet(): + if self._cif.irs: + self._refreshStorageDomains() + self._stopEvent.wait(self._interval) + except: + logging.error("Error while refreshing storage domains", + exc_info=True) diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 72848f8..0281c4d 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1569,6 +1569,8 @@ # # @cpuUserVdsmd: Ratio of CPU time spent in userspace by vdsm # +# @storageDomains: Storage Domain vital statistics +# # @elapsedTime: The number of seconds that vdsm has been running # # @memUsed: The percentage of memory used (not including caches) @@ -1626,6 +1628,7 @@ 'network': 'HostNetworkInterfaceStatsMap', 'rxDropped': 'uint', 'txDropped': 'uint', 'cpuSysVdsmd': 'float', 'cpuUserVdsmd': 'float', + 'storageDomains': 'StorageDomainVitalsMap', 'elapsedTime': 'uint', 'memUsed': 'uint', 'anonHugePages': 'uint', 'cpuLoad': 'float', 'diskStats': 'PathStatsMap', 'thpState': 'THPStates', -- To view, visit http://gerrit.ovirt.org/21013 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5502264af5278d8568e9a51360598c39e28e05ef Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 6

Change in vdsm[ovirt-3.3]: Avoid M2Crypto races
by Dan Kenigsberg 07 Nov '13

07 Nov '13

Hello Juan Hernandez, Yaniv Bronhaim, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/20936 to review the following change. Change subject: Avoid M2Crypto races ...................................................................... Avoid M2Crypto races As documented in http://www.heikkitoivonen.net/m2crypto/api/M2Crypto.threading-module.html and painfully recognized long ago in https://bugzilla.redhat.com/482420, using M2Crypto in a multi-threaded server such as Vdsm requires explicit initialization. Bug-Url: https://bugzilla.redhat.com/1026556 Change-Id: I83a3ab41a7001758bd37b0124904fbcd0387ffbf Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> Reviewed-on: http://gerrit.ovirt.org/20813 Reviewed-by: Juan Hernandez <juan.hernandez(a)redhat.com> Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M lib/vdsm/SecureXMLRPCServer.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/20936/1 diff --git a/lib/vdsm/SecureXMLRPCServer.py b/lib/vdsm/SecureXMLRPCServer.py index f60baef..7e3563a 100644 --- a/lib/vdsm/SecureXMLRPCServer.py +++ b/lib/vdsm/SecureXMLRPCServer.py @@ -35,10 +35,13 @@ import SocketServer import logging +import M2Crypto from M2Crypto import SSL, X509 from vdsm.utils import IPXMLRPCRequestHandler, IPXMLRPCServer +M2Crypto.threading.init() + SecureXMLRPCRequestHandler = IPXMLRPCRequestHandler -- To view, visit http://gerrit.ovirt.org/20936 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83a3ab41a7001758bd37b0124904fbcd0387ffbf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>

1 3

Change in vdsm[master]: Update of the guest memory stats schema
by Vinzenz Feenstra 07 Nov '13

07 Nov '13

Vinzenz Feenstra has uploaded a new change for review. Change subject: Update of the guest memory stats schema ...................................................................... Update of the guest memory stats schema Newer guest agent versions are now additionally reporting swap stats. This needs to be reflected in the schema. Change-Id: Ic6326ecac58e459cc73b87274cb18e8a3cf2ab41 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1025845 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/20959/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 72848f8..a6469fb 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -5265,27 +5265,37 @@ # # Memory statistics as reported by the guest agent. # -# @mem_total: The total amount of memory available to the OS (in KiB) +# @mem_total: The total amount of memory available to the OS +# (in KiB) # -# @mem_unused: The amount of memory that is completely unused (in KiB) +# @mem_unused: The amount of memory that is completely unused +# (in KiB) # -# @mem_free: The amount of memory available for allocation in KiB (includes -# easily reclaimable memory) +# @mem_free: The amount of memory available for allocation in +# KiB (includes easily reclaimable memory) # -# @swap_in: The number of memory pages swapped in since the last collection +# @swap_in: The number of memory pages swapped in since the +# last collection # -# @swap_out: The number of memory pages swapped out since the last collection +# @swap_out: The number of memory pages swapped out since the +# last collection # -# @pageflt: The number of page faults since the last collection +# @pageflt: The number of page faults since the last collection # -# @majflt: The number of major page faults since the last collection +# @majflt: The number of major page faults since the last +# collection +# +# @swap_total: #optional The total amount of swap space available to the OS +# (in KiB) +# +# @swap_usage: #optional The amount of swap space used by the OS (in KiB) # # Since: 4.10.0 ## {'type': 'GuestMemoryStats', 'data': {'mem_total': 'str', 'mem_unused': 'str', 'mem_free': 'str', 'swap_in': 'uint', 'swap_out': 'uint', 'pageflt': 'uint', - 'majflt': 'uint'}} + 'majflt': 'uint', '*swap_total': 'str', '*swap_usage': 'str'}} ## # @BalloonInfo: -- To view, visit http://gerrit.ovirt.org/20959 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6326ecac58e459cc73b87274cb18e8a3cf2ab41 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

4 4

Change in vdsm[master]: Get oop from object instance
by shuming＠linux.vnet.ibm.com 07 Nov '13

07 Nov '13

Shu Ming has uploaded a new change for review. Change subject: Get oop from object instance ...................................................................... Get oop from object instance In FileStorageDomain non-class method, self.oop should be used instead of oop Change-Id: Ia6b86f2c5e382774003772837e32bd62f8ad29ce Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com> --- M vdsm/storage/fileSD.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/8920/1 diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index f92ed98..7d6e1ab 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -177,7 +177,7 @@ def getReadDelay(self): t = time.time() - oop.getProcessPool(self.sdUUID).directReadLines(self.metafile) + self.oop.getProcessPool(self.sdUUID).directReadLines(self.metafile) return time.time() - t def getFileList(self, pattern, caseSensitive): -- To view, visit http://gerrit.ovirt.org/8920 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6b86f2c5e382774003772837e32bd62f8ad29ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shu Ming <shuming(a)linux.vnet.ibm.com>

6 8

Change in vdsm[master]: iscsi: Iscsi rescan cleanup
by smizrahi＠redhat.com 06 Nov '13

06 Nov '13

Saggi Mizrahi has uploaded a new change for review. Change subject: iscsi: Iscsi rescan cleanup ...................................................................... iscsi: Iscsi rescan cleanup * Remove forceIscsiScan(): iscsiadm already does that when refreshing sessions * Cleanup iscsi.rescan(): Replace complex logic with a simpler implementation since new iscsiadm takes care of all of this itself * Make iscsi.rescan() more testable * Test confusing timeout semantics of iscsi.rescan() Bug-Url: https://bugzilla.redhat.com/983553 Change-Id: I842eb37cea3bd5e8cd357a310dd966081b242abd Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M tests/Makefile.am A tests/iscsiTests.py M vdsm.spec.in M vdsm/storage/iscsi.py M vdsm/storage/iscsiadm.py M vdsm/storage/multipath.py M vdsm/supervdsmServer 7 files changed, 173 insertions(+), 62 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/19256/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f1f1da..e711f9c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,6 +36,7 @@ guestIFTests.py \ hooksTests.py \ ipwrapperTests.py \ + iscsiTests.py \ netconfTests.py \ netmodelsTests.py \ jsonRpcTests.py \ diff --git a/tests/iscsiTests.py b/tests/iscsiTests.py new file mode 100644 index 0000000..6bb5bfa --- /dev/null +++ b/tests/iscsiTests.py @@ -0,0 +1,142 @@ +# +# Copyright 2012-2013 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 errno + +from testrunner import VdsmTestCase as TestCaseBase +from vdsm import utils +from storage import misc +import time + + +class RetryTests(TestCaseBase): + def testStopCallback(self): + counter = [0] + limit = 4 + + def stopCallback(): + counter[0] += 1 + if counter[0] == limit: + return True + + return False + + def foo(): + raise RuntimeError("If at first you don't succeed, try, try again." + "Then quit. There's no point in being a damn" + "fool about it.") + # W. C. Fields + + self.assertRaises(RuntimeError, utils.retry, foo, tries=(limit + 10), + sleep=0, stopCallback=stopCallback) + # Make sure we had the proper amount of iterations before failing + self.assertEquals(counter[0], limit) + + +class PidStatTests(TestCaseBase): + def test(self): + args = ["sleep", "3"] + sproc = misc.execCmd(args, sync=False, sudo=False) + stats = utils.pidStat(sproc.pid) + pid = int(stats.pid) + # procName comes in the format of (procname) + name = stats.comm + self.assertEquals(pid, sproc.pid) + self.assertEquals(name, args[0]) + sproc.kill() + sproc.wait() + + +class CommandPathTests(TestCaseBase): + def testExisting(self): + cp = utils.CommandPath('sh', 'utter nonsense', '/bin/sh') + self.assertEquals(cp.cmd, '/bin/sh') + + def testMissing(self): + NAME = 'nonsense' + try: + utils.CommandPath(NAME, 'utter nonsense').cmd + except OSError as e: + self.assertEquals(e.errno, errno.ENOENT) + self.assertTrue(NAME in e.strerror, + msg='%s not in %s' % (NAME, e.strerror)) + + +class GeneralUtilsTests(TestCaseBase): + def testPanic(self): + self.assertRaises(AssertionError, utils.panic, "panic test") + + +class AsyncProcessOperationTests(TestCaseBase): + def _echo(self, text): + proc = misc.execCmd(["echo", "-n", "test"], sync=False) + + def parse(rc, out, err): + return out + + return utils.AsyncProcessOperation(proc, parse) + + def _sleep(self, t): + proc = misc.execCmd(["sleep", str(t)], sync=False) + return utils.AsyncProcessOperation(proc) + + def _fail(self, t): + proc = misc.execCmd(["sleep", str(t)], sync=False) + + def parse(rc, out, err): + raise Exception("TEST!!!") + + return utils.AsyncProcessOperation(proc, parse) + + def test(self): + aop = self._sleep(1) + self.assertEquals(aop.result(), ((0, "", ""), None)) + + def testAlreadyExitedSuccess(self): + aop = self._sleep(0) + time.sleep(1) + self.assertEquals(aop.result(), ((0, "", ""), None)) + + def testAlreadyExitedFail(self): + aop = self._sleep("hello") + time.sleep(1) + self.assertEquals(aop.result(), ( + (0, "", + "sleep: invalid time interval 'hello'\n" + "Try 'sleep --help' for more information.\n"), None)) + + def testParser(self): + aop = self._echo("test") + self.assertEquals(aop.result(), ("test", None)) + + def testStop(self): + aop = self._sleep(10) + aop.stop() + + start = time.time() + aop.result() + end = time.time() + duration = end - start + self.assertTrue(duration < 2) + + def testException(self): + aop = self._fail(1) + res, err = aop.result() + self.assertEquals(res, None) + self.assertNotEquals(err, None) diff --git a/vdsm.spec.in b/vdsm.spec.in index f66c3bd..99617b7 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -147,7 +147,7 @@ # Update the qemu-kvm requires when block_stream will be included Requires: qemu-kvm >= 2:0.12.1.2-2.295.el6_3.4 Requires: qemu-img >= 2:0.12.1.2-2.295.el6_3.4 -Requires: iscsi-initiator-utils >= 6.2.0.872-15 +Requires: iscsi-initiator-utils >= 6.2.0.873-3 Requires: device-mapper-multipath >= 0.4.9-52 Requires: e2fsprogs >= 1.41.12-11 Requires: fence-agents diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index 7da94ab..f4fdceb 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -30,7 +30,6 @@ import time from collections import namedtuple -from vdsm import constants import misc from vdsm.config import config import devicemapper @@ -373,38 +372,15 @@ @misc.samplingmethod -def rescan(): - try: - iscsiadm.session_rescan() - except iscsiadm.IscsiError: - pass +def rescan(minTimeout=None, maxTimeout=None): + # FIXME: This whole thing is wrong from the core. We need to make rescan + # completely async and have methods timeout on their own if they + # can't find the devices they are looking for + if minTimeout is None: + minTimeout = config.getint('irs', 'scsi_rescan_minimal_timeout') + if maxTimeout is None: + maxTimeout = config.getint('irs', 'scsi_rescan_maximal_timeout') - -(a)misc.samplingmethod -def forceScsiScan(): - processes = [] - minTimeout = config.getint('irs', 'scsi_rescan_minimal_timeout') - maxTimeout = config.getint('irs', 'scsi_rescan_maximal_timeout') - for hba in glob.glob(SCAN_PATTERN): - cmd = [constants.EXT_DD, 'of=' + hba] - p = misc.execCmd(cmd, sudo=False, sync=False) - try: - p.stdin.write("- - -") - p.stdin.flush() - p.stdin.close() - except OSError as e: - if p.wait(0) is False: - log.error("pid %s still running", p.pid) - log.warning("Error in rescan of hba:%s with returncode:%s and " - "error message: %s", hba, p.returncode, - p.stderr.read(1000)) - if e.errno != errno.EPIPE: - raise - else: - log.warning("Ignoring error in rescan of hba %s: ", - hba, exc_info=True) - continue - processes.append((hba, p)) if (minTimeout > maxTimeout or minTimeout < 0): minTimeout = 2 maxTimeout = 30 @@ -412,24 +388,13 @@ "illegal value: scsi_rescan_minimal_timeout or " "scsi_rescan_maximal_timeout. Set to %s and %s seconds " "respectively.", minTimeout, maxTimeout) + log.debug("Performing SCSI scan, this will take up to %s seconds", maxTimeout) + + rescanOp = iscsiadm.session_rescan_async() time.sleep(minTimeout) - for i in xrange(maxTimeout - minTimeout): - for p in processes[:]: - (hba, proc) = p - if proc.wait(0): - if proc.returncode != 0: - log.warning('returncode for: %s is: %s', hba, - proc.returncode) - processes.remove(p) - if not processes: - break - else: - time.sleep(1) - else: - log.warning("Still waiting for scsi scan of hbas: %s", - tuple(hba for p in processes)) + rescanOp.wait(timeout=(maxTimeout - minTimeout)) def devIsiSCSI(dev): diff --git a/vdsm/storage/iscsiadm.py b/vdsm/storage/iscsiadm.py index 6b58d15..6f122c3 100644 --- a/vdsm/storage/iscsiadm.py +++ b/vdsm/storage/iscsiadm.py @@ -1,6 +1,7 @@ from threading import Lock import misc from vdsm import constants +from vdsm.utils import AsyncProcessOperation # iscsiadm exit statuses ISCSI_ERR_SESS_EXISTS = 15 @@ -71,7 +72,7 @@ _iscsiadmLock = Lock() -def _runCmd(args, hideValue=False): +def _runCmd(args, hideValue=False, sync=True): # FIXME: I don't use supervdsm because this entire module has to just be # run as root and there is no such feature yet in supervdsm. When such # feature exists please change this. @@ -88,7 +89,7 @@ if i < (len(printCmd) - 1): printCmd[i + 1] = "****" - return misc.execCmd(cmd, printable=printCmd, sudo=True) + return misc.execCmd(cmd, printable=printCmd, sudo=True, sync=sync) def iface_exists(interfaceName): @@ -292,12 +293,21 @@ raise IscsiNodeError(rc, out, err) -def session_rescan(): - rc, out, err = _runCmd(["-m", "session", "-R"]) - if rc == 0: - return +def session_rescan_async(): + proc = _runCmd(["-m", "session", "-R"], sync=False) - raise IscsiSessionError(rc, out, err) + def parse_result(rc, out, err): + if rc == 0: + return + + raise IscsiSessionError(rc, out, err) + + return AsyncProcessOperation(proc, parse_result) + + +def session_rescan(): + aop = session_rescan_async() + return aop.result() def session_logout(sessionId): diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index c31b5c3..6d6fcbd 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -109,8 +109,6 @@ # First ask iSCSI to rescan all its sessions iscsi.rescan() - supervdsm.getProxy().forceScsiScan() - # Now let multipath daemon pick up new devices _runCmd("-r") diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 588f7fa..7094187 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -51,7 +51,6 @@ from lsblk import getLsBlk as _getLsBlk from storage.multipath import getScsiSerial as _getScsiSerial -from storage.iscsi import forceScsiScan as _forceScsiScan from storage.iscsi import getDevIscsiInfo as _getdeviSCSIinfo from storage.iscsi import readSessionInfo as _readSessionInfo from supervdsm import _SuperVdsmManager @@ -142,10 +141,6 @@ @logDecorator def getScsiSerial(self, *args, **kwargs): return _getScsiSerial(*args, **kwargs) - - @logDecorator - def forceScsiScan(self, *args, **kwargs): - return _forceScsiScan(*args, **kwargs) @logDecorator def removeDeviceMapping(self, devName): -- To view, visit http://gerrit.ovirt.org/19256 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842eb37cea3bd5e8cd357a310dd966081b242abd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

7 26

Change in vdsm[master]: cleanup: Improve networking imports (PEP328)
by asegurap＠redhat.com 06 Nov '13

06 Nov '13

Antoni Segura Puimedon has uploaded a new change for review. Change subject: cleanup: Improve networking imports (PEP328) ...................................................................... cleanup: Improve networking imports (PEP328) PEP328 ( http://www.python.org/dev/peps/pep-0328/ ) does away with the ambiguity of where the modules that are being imported reside making the codebase much more browsable. With a codebase of: package/ __init__.py subpackage1/ __init__.py moduleX.py moduleY.py subpackage2/ __init__.py moduleZ.py moduleA.py this (moduleY.py): import moduleX import moduleZ becomes from . import moduleX from ..subpackage2 import moduleZ Which makes it much more evident where things are and avoids possible shadowing of packages in site-packages. Change-Id: I249cfa0ad734ea45ecbbecbade9daeed6c3adc12 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M lib/vdsm/ipwrapper.py M lib/vdsm/netconfpersistence.py M lib/vdsm/netinfo.py M vdsm/configNetwork.py M vdsm/netconf/__init__.py M vdsm/netconf/ifcfg.py M vdsm/netconf/iproute2.py M vdsm/netconf/libvirtCfg.py M vdsm/netmodels.py M vdsm/sourceRoute.py M vdsm/sourceRouteThread.py M vdsm/tc.py M vdsm/vdsm-restore-net-config 13 files changed, 77 insertions(+), 71 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/20555/1 diff --git a/lib/vdsm/ipwrapper.py b/lib/vdsm/ipwrapper.py index cf0c069..a3455de 100644 --- a/lib/vdsm/ipwrapper.py +++ b/lib/vdsm/ipwrapper.py @@ -16,6 +16,7 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import from collections import namedtuple @@ -23,8 +24,8 @@ from netaddr import IPAddress from netaddr import IPNetwork -from utils import CommandPath -from utils import execCmd +from .utils import CommandPath +from .utils import execCmd _IP_BINARY = CommandPath('ip', '/sbin/ip') diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index 633cb94..34c9ea8 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -17,16 +17,17 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import import errno import json import logging import os -from config import config -from tool.restore_nets import restore -import constants -import utils +from .config import config +from .tool.restore_nets import restore +from . import constants +from . import utils CONF_RUN_DIR = constants.P_VDSM_RUN + 'netconf/' diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 60088d4..1c41802 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -17,27 +17,26 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import from collections import namedtuple -import errno from fnmatch import fnmatch from glob import iglob from itertools import chain +from xml.dom import minidom +import errno import logging import os import shlex import socket import struct -from xml.dom import minidom import ethtool -from config import config -import constants -from ipwrapper import Route -from ipwrapper import routeShowAllDefaultGateways -import libvirtconnection -from ipwrapper import linkShowDev +from .config import config +from . import constants +from . import libvirtconnection +from .ipwrapper import linkShowDev, Route, routeShowAllDefaultGateways NET_CONF_DIR = '/etc/sysconfig/network-scripts/' # ifcfg persistence directories diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 3894691..06a7e9e 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -16,32 +16,24 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import from functools import wraps import inspect -import sys -import os -import traceback -import time import logging +import os +import sys +import time +import traceback +from . import hooks +from . import neterrors as ne +from .netconf.ifcfg import ConfigWriter, Ifcfg +from .neterrors import ConfigNetworkError +from .netmodels import Bond, Bridge, IPv4, IPv6, IpConfig, Nic, Vlan from vdsm.config import config -from vdsm import constants -from vdsm import utils -from storage.misc import execCmd -import neterrors as ne -from neterrors import ConfigNetworkError -from vdsm import netinfo -from netconf.ifcfg import ConfigWriter -from netconf.ifcfg import Ifcfg -from netmodels import Bond -from netmodels import Bridge -from netmodels import IPv4 -from netmodels import IPv6 -from netmodels import IpConfig -from netmodels import Nic -from netmodels import Vlan -import hooks +from vdsm import constants, netinfo, utils +from vdsm.utils import execCmd CONNECTIVITY_TIMEOUT_DEFAULT = 4 diff --git a/vdsm/netconf/__init__.py b/vdsm/netconf/__init__.py index 627c84a..42aa061 100644 --- a/vdsm/netconf/__init__.py +++ b/vdsm/netconf/__init__.py @@ -16,14 +16,14 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import import logging -from netmodels import Bond, Bridge -from sourceRoute import DynamicSourceRoute -from sourceRoute import StaticSourceRoute -from vdsm import netinfo +from ..netmodels import Bond, Bridge +from ..sourceRoute import DynamicSourceRoute, StaticSourceRoute from vdsm.config import config +from vdsm import netinfo from vdsm.netconfpersistence import RunningConfig diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py index b2dcda8..3e4427a 100644 --- a/vdsm/netconf/ifcfg.py +++ b/vdsm/netconf/ifcfg.py @@ -16,6 +16,7 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import import glob import libvirt @@ -28,18 +29,15 @@ import shutil import threading -from netconf import Configurator -from neterrors import ConfigNetworkError -from netmodels import Nic, Bridge, IpConfig -from sourceRoute import DynamicSourceRoute +from . import Configurator, libvirtCfg +from .. import dsaversion +from .. import neterrors as ne +from ..neterrors import ConfigNetworkError +from ..netmodels import Bridge, IpConfig, Nic +from ..sourceRoute import DynamicSourceRoute from vdsm.config import config -from vdsm import constants -from vdsm import netinfo -from vdsm import utils +from vdsm import constants, netinfo, utils from vdsm.netconfpersistence import RunningConfig -import dsaversion -import libvirtCfg -import neterrors as ne class Ifcfg(Configurator): diff --git a/vdsm/netconf/iproute2.py b/vdsm/netconf/iproute2.py index b198ede..67bf85d 100644 --- a/vdsm/netconf/iproute2.py +++ b/vdsm/netconf/iproute2.py @@ -18,10 +18,7 @@ # -from vdsm.ipwrapper import routeAdd -from vdsm.ipwrapper import routeDel -from vdsm.ipwrapper import ruleAdd -from vdsm.ipwrapper import ruleDel +from vdsm.ipwrapper import routeAdd, routeDel, ruleAdd, ruleDel class Iproute2(object): diff --git a/vdsm/netconf/libvirtCfg.py b/vdsm/netconf/libvirtCfg.py index b81231d..0dcfeac 100644 --- a/vdsm/netconf/libvirtCfg.py +++ b/vdsm/netconf/libvirtCfg.py @@ -20,8 +20,7 @@ from xml.dom.minidom import Document from xml.sax.saxutils import escape -from vdsm import libvirtconnection -from vdsm import netinfo +from vdsm import libvirtconnection, netinfo def flush(): diff --git a/vdsm/netmodels.py b/vdsm/netmodels.py index e6feeb5..f673fb4 100644 --- a/vdsm/netmodels.py +++ b/vdsm/netmodels.py @@ -16,6 +16,8 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import + from collections import namedtuple from contextlib import contextmanager import logging @@ -24,9 +26,9 @@ import socket import struct -from neterrors import ConfigNetworkError +from . import neterrors as ne +from .neterrors import ConfigNetworkError from vdsm import netinfo -import neterrors as ne class NetDevice(object): diff --git a/vdsm/sourceRoute.py b/vdsm/sourceRoute.py index 72519d9..e43a77c 100644 --- a/vdsm/sourceRoute.py +++ b/vdsm/sourceRoute.py @@ -16,20 +16,16 @@ # # Refer to the README and COPYING files for full details of the license # +from glob import iglob +import logging import os -from glob import iglob from libvirt import libvirtError -import logging import netaddr -from vdsm import netinfo from vdsm.constants import P_VDSM_RUN -from vdsm.ipwrapper import IPRoute2Error -from vdsm.ipwrapper import Route -from vdsm.ipwrapper import routeShowTable -from vdsm.ipwrapper import Rule -from vdsm.ipwrapper import ruleList +from vdsm import netinfo +from vdsm.ipwrapper import IPRoute2Error, Route, routeShowTable, Rule, ruleList from vdsm.utils import rmFile diff --git a/vdsm/sourceRouteThread.py b/vdsm/sourceRouteThread.py index 6106a3f..014ed39 100644 --- a/vdsm/sourceRouteThread.py +++ b/vdsm/sourceRouteThread.py @@ -1,10 +1,30 @@ +# Copyright 2013 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from __future__ import absolute_import + import logging import os import pyinotify -from netconf.iproute2 import Iproute2 -from sourceRoute import DynamicSourceRoute +from .netconf.iproute2 import Iproute2 +from .sourceRoute import DynamicSourceRoute from vdsm.constants import P_VDSM_RUN diff --git a/vdsm/tc.py b/vdsm/tc.py index 57c8333..2b2dfa5 100644 --- a/vdsm/tc.py +++ b/vdsm/tc.py @@ -26,8 +26,8 @@ import ethtool -import storage.misc from vdsm.constants import EXT_TC +from vdsm.utils import execCmd ERR_DEV_NOEXIST = 2 @@ -99,7 +99,7 @@ def _process_request(command): - retcode, out, err = storage.misc.execCmd(command, raw=True, sudo=False) + retcode, out, err = execCmd(command, raw=True, sudo=False) if retcode != 0: raise TrafficControlException(retcode, err, command) return out diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 29b2a8d..6cdf84e 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -1,6 +1,6 @@ #! /usr/bin/python # -# Copyright 2011-2012 Red Hat, Inc. +# Copyright 2011-2013 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 @@ -18,14 +18,15 @@ # # Refer to the README and COPYING files for full details of the license # +from __future__ import absolute_import import logging import logging.config -from netconf import ifcfg +from .configNetwork import setupNetworks +from .netconf import ifcfg from vdsm.config import config from vdsm.netconfpersistence import RunningConfig, PersistentConfig -from configNetwork import setupNetworks def ifcfg_restoration(): -- To view, visit http://gerrit.ovirt.org/20555 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I249cfa0ad734ea45ecbbecbade9daeed6c3adc12 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

7 29

Change in vdsm[ovirt-3.3]: Fix ballooning rules for computing the minimum available memory
by Martin Sivak 06 Nov '13

06 Nov '13

Martin Sivák has uploaded a new change for review. Change subject: Fix ballooning rules for computing the minimum available memory ...................................................................... Fix ballooning rules for computing the minimum available memory Change-Id: Ie416db6580462bbd16e80bea0a4e339656eccb0f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1025845 Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- M vdsm/mom.d/02-balloon.policy 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/20906/1 diff --git a/vdsm/mom.d/02-balloon.policy b/vdsm/mom.d/02-balloon.policy index cc328aa..26c30e2 100644 --- a/vdsm/mom.d/02-balloon.policy +++ b/vdsm/mom.d/02-balloon.policy @@ -46,7 +46,7 @@ # Given current conditions, determine the ideal guest memory size (defvar guest_used_mem (- (guest.StatAvg "balloon_cur") (guest.StatAvg "mem_unused"))) - (defvar balloon_min (min guest.balloon_min (+ guest_used_mem + (defvar balloon_min (max guest.balloon_min (+ guest_used_mem (* guest_free_percent guest.balloon_cur)))) # But do not change it too fast (defvar balloon_size (* guest.balloon_cur @@ -79,7 +79,7 @@ # Minimally, increase so the guest has its desired free memory (defvar guest_used_mem (- (guest.StatAvg "balloon_cur") (guest.StatAvg "mem_unused"))) - (defvar balloon_min (min guest.balloon_min (+ guest_used_mem + (defvar balloon_min (max guest.balloon_min (+ guest_used_mem (* guest_free_percent guest.balloon_cur)))) # Otherwise, increase according to the max balloon change (defvar balloon_size (* guest.balloon_cur -- To view, visit http://gerrit.ovirt.org/20906 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie416db6580462bbd16e80bea0a4e339656eccb0f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>

4 8

Change in vdsm[master]: Update of vdsmd usage
by ybronhei＠redhat.com 06 Nov '13

06 Nov '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Update of vdsmd usage ...................................................................... Update of vdsmd usage Change-Id: Id1f2700a4ac2f869ded61f1ba6b5e05b03216348 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M init/sysvinit/vdsmd.init.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/20677/1 diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index fcfceda..1feacde 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -209,7 +209,7 @@ RETVAL=$? ;; *) - echo "Usage: $0 {start|stop|status|restart|force-reload|try-restart}" + echo "Usage: $0 {start|stop|status|restart|force-reload|try-restart|condrestart|reconfigure [force]}" RETVAL=2 esac -- To view, visit http://gerrit.ovirt.org/20677 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1f2700a4ac2f869ded61f1ba6b5e05b03216348 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

2 4

Change in vdsm[master]: Reconfigure related services after vdsm rpm upgrade
by ybronhei＠redhat.com 06 Nov '13

06 Nov '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Reconfigure related services after vdsm rpm upgrade ...................................................................... Reconfigure related services after vdsm rpm upgrade When performing an upgrade we might require reconfiguration of related services. This patch force reconfigure of all related services and restart them afterwards. After reconfigure is done, we're safe to start vdsmd as usual. Change-Id: I4a8c9c548b7a23588107b17351ab7f9ba3ae1d2b Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm.spec.in 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/20149/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index cf3dbc7..8384057 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -729,8 +729,10 @@ %postun %if 0%{?rhel} if [ "$1" -ge 1 ]; then - /sbin/service vdsmd condrestart > /dev/null 2>&1 - /sbin/service supervdsmd condrestart > /dev/null 2>&1 + if /sbin/service vdsmd condrestart > /dev/null 2>&1; then + %{_bindir}/vdsm-tool configure-all --force + /sbin/service vdsmd start > /dev/null 2>/dev/null + fi fi exit 0 %else -- To view, visit http://gerrit.ovirt.org/20149 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a8c9c548b7a23588107b17351ab7f9ba3ae1d2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

4 17

← Newer
1
...
49
50
51
52
53
54
55
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2013