vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: Add shutdown based on qemu-ga(qemu guest agent) in vdsm
by shaohef＠linux.vnet.ibm.com 03 Dec '13

03 Dec '13

Hello Bing Bu Cao, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9655 to review the following change. Change subject: Add shutdown based on qemu-ga(qemu guest agent) in vdsm ...................................................................... Add shutdown based on qemu-ga(qemu guest agent) in vdsm As previously what we agreed, the agent-assisted shutdown and fsfreeze would be handled by the qemu guest agent while oVirt-specific functionality such as Single-Sign-On would continue to be managed by the ovirt guest agent. http://www.ovirt.org/wiki/Guest_agent_proposals This patch changes the shutdown verb, add an shutdown approach by qemu guest agent Change-Id: I86977c1b717d63de21ba4818c6b66e43976d65de Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: BingBu Cao <mars(a)linux.vnet.ibm.com> --- M vdsm/libvirtvm.py M vdsm/vm.py 2 files changed, 84 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/9655/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index f20968f..f1d82d7 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1222,6 +1222,8 @@ self._releaseLock = threading.Lock() self.saveState() + self.shutdownMethodUpdate() + def _buildLease(self, domainID, volumeID, leasePath, leaseOffset): """ Add a single SANLock lease. @@ -2326,9 +2328,45 @@ physical, alloc) self.extendDriveVolume(d) + def shutdownMethodUpdate(self): + self._shutdownMethods = [] + self._shutdownMethods.append({'qemugaShutdown': + self.qemugaShutdown}) + self._shutdownMethods.append({'guestAgentShutdown': + self.guestAgentShutdown}) + self._shutdownMethods.append({'acpiShutdown': + self.acpiShutdown}) + def _acpiShutdown(self): self._dom.shutdownFlags(libvirt.VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) + def acpiShutdown(self, now, *args): + if utils.tobool(self.conf.get('acpiEnable', 'true')): + self.log.debug("acpiShutdown vm") + self._guestEventTime = now + self._guestEvent = 'Powering down' + self._acpiShutdown() + else: + return None + + return {'status': {'code': doneCode['code'], + 'message': 'Machine shut down'}} + + def _qemugaShutdown(self): + self._dom.shutdownFlags(libvirt.VIR_DOMAIN_SHUTDOWN_GUEST_AGENT) + + def qemugaShutdown(self, now, *args): + if utils.tobool(self.conf.get('qgaEnable', 'true')): + self.log.debug("qemugaShutdown vm") + self._guestEventTime = now + self._guestEvent = 'Powering down' + self._qemugaShutdown() + else: + return None + + return {'status': {'code': doneCode['code'], + 'message': 'Machine shut down'}} + def _getPid(self): pid = '0' try: diff --git a/vdsm/vm.py b/vdsm/vm.py index cb0e552..bf6ee8b 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -364,6 +364,8 @@ CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], BALLOON_DEVICES: [], REDIR_DEVICES: [], WATCHDOG_DEVICES: []} + self._shutdownMethods = [] + self.shutdownMethodUpdate() def _get_lastStatus(self): PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -970,35 +972,51 @@ if not guestCpuLocked: self._guestCpuLock.release() + def shutdownMethodUpdate(self): + self._shutdownMethods = [] + self._shutdownMethods.append({'guestAgentShutdown': + self._guestAgentShutdown}) + def shutdown(self, timeout, message): - try: - now = time.time() - if self.lastStatus == 'Down': - return - if self.guestAgent and self.guestAgent.isResponsive(): - self._guestEventTime = now - self._guestEvent = 'Powering down' - self.log.debug('guestAgent shutdown called') - self.guestAgent.desktopShutdown(timeout, message) - agent_timeout = (int(timeout) + - config.getint('vars', 'sys_shutdown_timeout')) - timer = threading.Timer(agent_timeout, self._timedShutdown) - timer.start() - elif utils.tobool(self.conf.get('acpiEnable', 'true')): - self._guestEventTime = now - self._guestEvent = 'Powering down' - self._acpiShutdown() - # No tools, no ACPI - else: - return { - 'status': { - 'code': errCode['exist']['status']['code'], - 'message': 'VM without ACPI or active SolidICE tools. ' - 'Try Forced Shutdown.'}} - except: - self.log.error("Shutdown failed", exc_info=True) - return {'status': {'code': errCode['exist']['status']['code'], - 'message': 'Failed to shutdown VM. Try Forced Shutdown.'}} + if self.lastStatus == 'Down': + return + now = time.time() + + status = None + for method, func in self._shutdownMethods: + try: + status = func(now, timeout, message) + except: + self.log.error("%s failed", method, exc_info=True) + status = {'status': + {'code': errCode['exist']['status']['code'], + 'message': 'Failed to shutdown VM. ' + 'Try Forced Shutdown.'}} + # if one shutdown method failed, will try another method + # the loop will stop once a shutdown method is successful + if doneCode['code'] == status['status']['code']: + return status + if not status: + return {'status': + {'code': errCode['exist']['status']['code'], + 'message': 'VM without ACPI or active SolidICE tools. ' + 'Try Forced Shutdown.'}} + + return status + + def guestAgentShutdown(self, now, timeout, message): + if self.guestAgent and self.guestAgent.isResponsive(): + self._guestEventTime = time.time() + self._guestEvent = 'Powering down' + self.log.debug('guestAgent shutdown called') + self.guestAgent.desktopShutdown(timeout, message) + agent_timeout = (int(timeout) + + config.getint('vars', 'sys_shutdown_timeout')) + timer = threading.Timer(agent_timeout, self._timedShutdown) + timer.start() + else: + return None + return {'status': {'code': doneCode['code'], 'message': 'Machine shut down'}} -- To view, visit http://gerrit.ovirt.org/9655 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86977c1b717d63de21ba4818c6b66e43976d65de Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Gerrit-Reviewer: Bing Bu Cao <mars(a)linux.vnet.ibm.com>

6 11

Change in vdsm[master]: [WIP] rest-api: Model Networks
by lilei＠linux.vnet.ibm.com 26 Nov '13

26 Nov '13

Lei Li has uploaded a new change for review. Change subject: [WIP] rest-api: Model Networks ...................................................................... [WIP] rest-api: Model Networks API Implemented: ---------------- /api/networks * list, create, confirm and edit configuration for network Actions: /api/networks/add - Add a new network /api/networks/confirm - Mark the current network configurations as safe /api/networks/<id>/delete - DELETE a network /api/networks/<id>/edit - Add a new network and replace the old one API as TODO: --------------- /api/networks/<id...>/setup - Add/Edit/Remove configuration for networks Change-Id: Ic7eca74c16699a5cc35c4077192fb6ecfe706470 Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- M vdsm/rest/Controller.py M vdsm/rest/templates/Makefile.am M vdsm/rest/templates/api.xsd A vdsm/rest/templates/network.json.x A vdsm/rest/templates/network.xml.x A vdsm/rest/templates/networks.json.x A vdsm/rest/templates/networks.xml.x M vdsm/rest/templates/root.json.x M vdsm/rest/templates/root.xml.x M vdsm/rest/templates/rsdl.xml 10 files changed, 377 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/5881/1 -- To view, visit http://gerrit.ovirt.org/5881 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7eca74c16699a5cc35c4077192fb6ecfe706470 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lei Li <lilei(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: Include vds_name parameter for node registration
by fgranha＠linux.vnet.ibm.com 26 Nov '13

26 Nov '13

Fernando Granha Jeronimo has uploaded a new change for review. Change subject: Include vds_name parameter for node registration ...................................................................... Include vds_name parameter for node registration Motivation: in ovirt, the vds_name does not need to be resolvable. In order to allow an arbitrary name, a new kernel parameter was created (node_name). If this paramter is not passed, vdsm-reg will stick to the hostname of the node (the previous behavior). Change-Id: Ic1b0bcc473ef1a034736f80e1424e211ddf02946 Signed-off-by: Fernando Granha Jeronimo <fgranha(a)linux.vnet.ibm.com> --- M vdsm_reg/config.py.in M vdsm_reg/vdsm-config M vdsm_reg/vdsm-reg-cmdline M vdsm_reg/vdsm-reg-setup.in M vdsm_reg/vdsm-reg.conf.in 5 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/8036/1 diff --git a/vdsm_reg/config.py.in b/vdsm_reg/config.py.in index 6519ec2..d00b427 100644 --- a/vdsm_reg/config.py.in +++ b/vdsm_reg/config.py.in @@ -35,5 +35,6 @@ config.set('vars', 'vdc_host_port', '80') config.set('vars', 'vdc_reg_port', '54321') config.set('vars', 'vdc_reg_uri', '/SolidICE/VdsAutoRegistration.aspx') +config.set('vars', 'vds_name', 'None') config.set('vars', 'vdsm_conf_file', '/etc/vdsm/vdsm.conf') config.set('vars', 'vdsm_dir', '@VDSMDIR@') diff --git a/vdsm_reg/vdsm-config b/vdsm_reg/vdsm-config index 1cb4c2c..6e0f7f3 100755 --- a/vdsm_reg/vdsm-config +++ b/vdsm_reg/vdsm-config @@ -65,6 +65,9 @@ rhevm_admin_password=*) rhevm_admin_password=${i#rhevm_admin_password=} ;; + node_name=*) + node_name=${i#node_name=} + ;; *) ;; esac @@ -75,6 +78,7 @@ vdc_managment_server=${managment_server%:*} vdc_managment_port=${managment_server#*:} strRHEVMAddress=$vdc_managment_server + vds_name=${node_name} tmp_vdsm_reg_conf=`mktemp` cat /etc/vdsm-reg/vdsm-reg.conf > "$tmp_vdsm_reg_conf" echo "checkpoint 3::management_server: $vdc_managment_server, management_port: $vdc_managment_port" >> $LOG 2>&1 @@ -108,6 +112,11 @@ echo "No management_server_fingerprint found." | tee -a $LOG fi + if [ ! -z "$vds_name" ]; then + sed --copy -i "s/$^vds_name=$$..*$$/\1${vds_name}/" \ + /etc/vdsm-reg/vdsm-reg.conf + fi + ## Set new configuration fWriteConfig=1 else diff --git a/vdsm_reg/vdsm-reg-cmdline b/vdsm_reg/vdsm-reg-cmdline index 92ed468..e7f0047 100644 --- a/vdsm_reg/vdsm-reg-cmdline +++ b/vdsm_reg/vdsm-reg-cmdline @@ -3,4 +3,5 @@ management_server management_server_fingerprint rhevm_admin_password +node_name ovirt_vdsm_disable diff --git a/vdsm_reg/vdsm-reg-setup.in b/vdsm_reg/vdsm-reg-setup.in index 492e38d..8652293 100644 --- a/vdsm_reg/vdsm-reg-setup.in +++ b/vdsm_reg/vdsm-reg-setup.in @@ -48,7 +48,12 @@ self.vdsmDir = config.get('vars', 'vdsm_dir') if self.vdcURL != "None": self.ovirtURL = deployUtil.getMGTIP(self.vdsmDir, self.vdcName) - self.ovirtName = socket.gethostname() + + # use the name from config file, otherwise get the fqdn + self.ovirtName = config.get('vars', 'vds_name') + if self.ovirtName is None or self.ovirtName == "None": + self.ovirtName = socket.gethostname() + self.ovirtUID = deployUtil.getHostID() else: self.ovirtURL = "None" diff --git a/vdsm_reg/vdsm-reg.conf.in b/vdsm_reg/vdsm-reg.conf.in index 2e9df0d..c38401c 100644 --- a/vdsm_reg/vdsm-reg.conf.in +++ b/vdsm_reg/vdsm-reg.conf.in @@ -13,6 +13,8 @@ vdc_host_port=443 #The registrtion uri vdc_reg_uri=/OvirtEngineWeb/register +# The name of this node (it does not need to be resolvable) +vds_name=None #Upgrade settings upgrade_iso_file=@VDSMUPGRADEDIR@/ovirt-node-image.iso upgrade_mount_point=/live -- To view, visit http://gerrit.ovirt.org/8036 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1b0bcc473ef1a034736f80e1424e211ddf02946 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Fernando Granha Jeronimo <fgranha(a)linux.vnet.ibm.com>

4 4

Change in vdsm[master]: Added utility to ensure that files written to the file syste...
by asegurap＠redhat.com 18 Nov '13

18 Nov '13

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Added utility to ensure that files written to the file system happen atomically. ...................................................................... Added utility to ensure that files written to the file system happen atomically. The only way in python to make a file be written in an atomic way is to take advantage of the fact that in POSIX filesystems the rename operation is atomic. Thus, we write the context to a temporary file on the same filesystem, sync on the file descriptor and finally do the atomic file rename to the original file we wanted to write. For more info: http://stackoverflow.com/questions/2333872/atomic-writing-to-file-with-pyth… http://stackoverflow.com/questions/7433057/is-rename-without-fsync-safe Change-Id: Ibecd61d6746231a5a8cb17bad9a3302b01454f27 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/configNetwork.py M vdsm/utils.py 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/7656/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 58117f8..b943574 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -369,7 +369,8 @@ '''Backs up the previous contents of the file referenced by fileName writes the new configuration and sets the specified access mode.''' self._backup(fileName) - open(fileName, 'w').write(configuration) + with utils.atomicWrite(fileName) as f: + f.write(configuration) os.chmod(fileName, 0664) try: selinux.restorecon(fileName) diff --git a/vdsm/utils.py b/vdsm/utils.py index 5e2d4e5..bb8a842 100644 --- a/vdsm/utils.py +++ b/vdsm/utils.py @@ -36,6 +36,7 @@ import fcntl import functools import stat +from contextlib import contextmanager import ethtool @@ -829,3 +830,17 @@ def __unicode__(self): return unicode(self.cmd) + +@contextmanager +def atomicWrite(file): + '''Context manager that makes the write happen to a temporary file and if + and only it is successful, overwrites the original file. It creates the + temporary file in the same directory of the destination file, as rename is + only atomic within the same filesystem.''' + tempFile = file+'vdsm_temp' + f = open(tempFile, 'w') + yield f + f.flush() + os.fsync(f.fileno()) + f.close() + os.rename(tempFile, file) -- To view, visit http://gerrit.ovirt.org/7656 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibecd61d6746231a5a8cb17bad9a3302b01454f27 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

4 10

Change in vdsm[master]: Add deathSignal options to better peopen
by smizrahi＠redhat.com 17 Nov '13

17 Nov '13

Saggi Mizrahi has uploaded a new change for review. Change subject: Add deathSignal options to better peopen ...................................................................... Add deathSignal options to better peopen This allows VDSM to specify as signal that will be sent by the kernel to the child when VDSM dies. - Also fixes problem in the makefile that would cause make not to recompile the SO when the C file was changed Change-Id: I9f987129cea112e2a75d6f02477369417cc50dc7 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/betterPopen/Makefile.am M vdsm/betterPopen/__init__.py M vdsm/betterPopen/createprocess.c 3 files changed, 35 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/6241/1 -- To view, visit http://gerrit.ovirt.org/6241 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f987129cea112e2a75d6f02477369417cc50dc7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

8 18

Change in vdsm[master]: Add build-dep packages so yum-builddep is effective
by Ryan Harper 13 Nov '13

13 Nov '13

Ryan Harper has uploaded a new change for review. Change subject: Add build-dep packages so yum-builddep is effective ...................................................................... Add build-dep packages so yum-builddep is effective yum-builddep doesn't get all of the required packages needed to build vdsm and vdsm rpms. Update the specfile Build-Requires to include the needed packages. Change-Id: Ia5b96b5b30a9efea06261f40d1f6df61754b8253 Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/7955/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 56a42b4..300dbe5 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -29,6 +29,9 @@ BuildRequires: pyflakes BuildRequires: python-nose BuildRequires: python-pep8 +BuildRequires: gcc +BuildRequires: automake +BuildRequires: rpm-build # BuildRequires needed by the tests during the build BuildRequires: python-ethtool -- To view, visit http://gerrit.ovirt.org/7955 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5b96b5b30a9efea06261f40d1f6df61754b8253 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>

5 7

Change in vdsm[master]: change of the isRunning function
by lvroyce＠linux.vnet.ibm.com 13 Nov '13

13 Nov '13

Hello Zhou Zheng Sheng, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/10236 to review the following change. Change subject: change of the isRunning function ...................................................................... change of the isRunning function isRunning() now checks supervdsm pid this not guarantee supervdsmServer really listened and manager framework works right. since ping is call to local manager so it won't take much time. Only ping() can identify whether supervdsm works fine. Change isRunning() to use ping() also eliminate Authentication error usecases: 1.first launch: ping fails because of _svdsm=None, launch supervdsm 2.previous _svdsm: ping fails with Autherror,kill and launch 3.previous svdsm exit:ping fails with socket error,launch 4.call error: raise to caller 5.ping succeed,svdsm killed when callmethod: raise error to caller Change-Id: Ib25809d4416f26bc95dc72e7b32b8b2a17a71879 Signed-off-by:Royce Lv<lvroyce(a)linux.vnet.ibm.com> Signed-off-by:Zhou Zheng Sheng<zhshzhou(a)linux.vnet.ibm.com> --- M tests/superVdsmTests.py M vdsm/supervdsm.py M vdsm/supervdsmServer.py 3 files changed, 24 insertions(+), 79 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/10236/1 diff --git a/tests/superVdsmTests.py b/tests/superVdsmTests.py index 87de66d..57f4de8 100644 --- a/tests/superVdsmTests.py +++ b/tests/superVdsmTests.py @@ -28,7 +28,7 @@ superVdsmCmd = [getNeededPythonPath(), constants.EXT_PYTHON, supervdsm.SUPERVDSM, self._authkey, str(os.getpid()), - self.pidfile, self.timestamp, self.address, + self.pidfile, self.address, str(os.getuid())] misc.execCmd(superVdsmCmd, sync=False, sudo=True) sleep(2) @@ -41,33 +41,24 @@ # temporary values to run temporary svdsm self.pidfd, pidfile = tempfile.mkstemp() - self.timefd, timestamp = tempfile.mkstemp() self.addfd, address = tempfile.mkstemp() - self._proxy.setIPCPaths(pidfile, timestamp, address) + self._proxy.setIPCPaths(pidfile, address) def tearDown(self): supervdsm.extraPythonPathList = [] - for fd in (self.pidfd, self.timefd, self.addfd): - os.close(fd) + os.close(self.pidfd) self._proxy.kill() # cleanning old temp files @MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart) def testIsSuperUp(self): - self._proxy.ping() # this call initiate svdsm - self.assertTrue(self._proxy.isRunning()) + self._proxy.ping() + self.assertTrue(self._proxy.isRunning()) # this call initiate svdsm @MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart) def testKillSuper(self): self._proxy.ping() self._proxy.kill() - self.assertFalse(self._proxy.isRunning()) + self.assertRaises(AttributeError, self._proxy.isRunning) self._proxy.ping() # Launching vdsm after kill self.assertTrue(self._proxy.isRunning()) - - @MonkeyPatch(supervdsm.SuperVdsmProxy, '_start', monkeyStart) - def testNoPidFile(self): - self._proxy.ping() # svdsm is up - self.assertTrue(self._proxy.isRunning()) - utils.rmFile(self._proxy.timestamp) - self.assertRaises(IOError, self._proxy.isRunning) diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py index 532d5ac..a9bbdf6 100644 --- a/vdsm/supervdsm.py +++ b/vdsm/supervdsm.py @@ -20,13 +20,11 @@ # import os -from multiprocessing import AuthenticationError from multiprocessing.managers import BaseManager import logging import threading import uuid from time import sleep -from errno import ENOENT, ESRCH import storage.misc as misc from vdsm import constants, utils @@ -45,7 +43,6 @@ raise RuntimeError("SuperVDSM Server not found") PIDFILE = os.path.join(constants.P_VDSM_RUN, "svdsm.pid") -TIMESTAMP = os.path.join(constants.P_VDSM_RUN, "svdsm.time") ADDRESS = os.path.join(constants.P_VDSM_RUN, "svdsm.sock") SUPERVDSM = __supervdsmServerPath("supervdsmServer.py") @@ -66,22 +63,16 @@ callMethod = lambda: \ getattr(self._supervdsmProxy._svdsm, self._funcName)(*args, **kwargs) - if not self._supervdsmProxy.isRunning(): - # getting inside only when svdsm is down. its rare case so we - # don't care that isRunning will run twice - with self._supervdsmProxy.proxyLock: - if not self._supervdsmProxy.isRunning(): - self._supervdsmProxy.launch() - try: - return callMethod() - # handling internal exception that we raise to identify supervdsm - # validation. only this exception can cause kill! - except AuthenticationError: - with self._supervdsmProxy.proxyLock: + with self._supervdsmProxy.proxyLock: + try: + # make sure supervdsmServer works right + self._supervdsmProxy.isRunning() + except: self._supervdsmProxy.kill() self._supervdsmProxy.launch() - return callMethod() + + return callMethod() class SuperVdsmProxy(object): @@ -92,25 +83,19 @@ def __init__(self): self.proxyLock = threading.Lock() - self._firstLaunch = True + self.setIPCPaths(PIDFILE, ADDRESS) - # Declaration of public variables that keep files' names that svdsm - # uses. We need to be able to change these variables so that running - # tests doesn't disturb and already running VDSM on the host. - self.setIPCPaths(PIDFILE, TIMESTAMP, ADDRESS) - - def setIPCPaths(self, pidfile, timestamp, address): + def setIPCPaths(self, pidfile, address): self.pidfile = pidfile - self.timestamp = timestamp self.address = address def open(self, *args, **kwargs): return self._manager.open(*args, **kwargs) def _cleanOldFiles(self): - self._log.debug("Cleanning svdsm old files: %s, %s, %s", - self.pidfile, self.timestamp, self.address) - for f in (self.pidfile, self.timestamp, self.address): + self._log.debug("Cleanning svdsm old files: %s, %s", + self.pidfile, self.address) + for f in (self.pidfile, self.address): utils.rmFile(f) def _start(self): @@ -122,7 +107,7 @@ # permissions to read those files. superVdsmCmd = [constants.EXT_PYTHON, SUPERVDSM, self._authkey, str(os.getpid()), - self.pidfile, self.timestamp, self.address, + self.pidfile, self.address, str(os.getuid())] misc.execCmd(superVdsmCmd, sync=False, sudo=True) @@ -134,42 +119,15 @@ pid = int(f.read().strip()) misc.execCmd([constants.EXT_KILL, "-9", str(pid)], sudo=True) except Exception: - self._log.error("Could not kill old Super Vdsm %s", - exc_info=True) + self._log.warn("Could not kill old Super Vdsm") self._cleanOldFiles() self._authkey = None self._manager = None self._svdsm = None - self._firstLaunch = True def isRunning(self): - try: - with open(self.pidfile, "r") as f: - spid = f.read().strip() - with open(self.timestamp, "r") as f: - createdTime = f.read().strip() - except IOError as e: - # pid file and timestamp file must be exist after first launch, - # otherwise excpetion will be raised to svdsm caller - if e.errno == ENOENT and self._firstLaunch: - return False - else: - raise - - try: - pTime = str(misc.getProcCtime(spid)) - except OSError as e: - if e.errno == ESRCH: - # Means pid is not exist, svdsm was killed - return False - else: - raise - - if pTime == createdTime: - return True - else: - return False + return self._svdsm.ping() def _connect(self): self._manager = _SuperVdsmManager(address=self.address, @@ -185,7 +143,6 @@ self._svdsm = self._manager.instance() def launch(self): - self._firstLaunch = False self._start() utils.retry(self._connect, Exception, timeout=60) diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 5effd41..8968a82 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -336,15 +336,12 @@ sys.exit(errno.EPERM) log.debug("Parsing cmd args") - authkey, parentPid, pidfile, timestamp, address, uid = sys.argv[1:] + authkey, parentPid, pidfile, address, uid = sys.argv[1:] - log.debug("Creating PID and TIMESTAMP files: %s, %s", - pidfile, timestamp) + log.debug("Creating PID:%s", pidfile) spid = os.getpid() with open(pidfile, "w") as f: f.write(str(spid) + "\n") - with open(timestamp, "w") as f: - f.write(str(misc.getProcCtime(spid) + "\n")) log.debug("Cleaning old socket %s", address) if os.path.exists(address): @@ -369,7 +366,7 @@ servThread.setDaemon(True) servThread.start() - for f in (address, timestamp, pidfile): + for f in (address, pidfile): chown(f, int(uid), METADATA_GROUP) log.debug("Started serving super vdsm object") -- To view, visit http://gerrit.ovirt.org/10236 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib25809d4416f26bc95dc72e7b32b8b2a17a71879 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

5 29

Change in vdsm[master]: Add ut to supervdsmServer zombie reaper
by lvroyce＠linux.vnet.ibm.com 10 Nov '13

10 Nov '13

Royce Lv has uploaded a new change for review. Change subject: Add ut to supervdsmServer zombie reaper ...................................................................... Add ut to supervdsmServer zombie reaper Change-Id: I7fb8f3dcd575266febe11967e3f8df7d3588acb8 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/superVdsmTests.py M vdsm/supervdsmServer.py 2 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/9354/1 diff --git a/tests/superVdsmTests.py b/tests/superVdsmTests.py index 20b1591..cb52ff1 100644 --- a/tests/superVdsmTests.py +++ b/tests/superVdsmTests.py @@ -4,6 +4,7 @@ import tempfile from vdsm import utils import os +from time import sleep class TestSuperVdsm(TestCaseBase): @@ -16,8 +17,11 @@ self.pidfd, pidfile = tempfile.mkstemp() self.timefd, timestamp = tempfile.mkstemp() self.addfd, address = tempfile.mkstemp() + self.pidfile = pidfile self._proxy.setIPCPaths(pidfile, timestamp, address) + self._proxy.ping() + self.assertTrue(self._proxy.isRunning()) def tearDown(self): for fd in (self.pidfd, self.timefd, self.addfd): @@ -25,19 +29,19 @@ self._proxy.kill() # cleanning old temp files def testIsSuperUp(self): - self._proxy.ping() # this call initiate svdsm - - self.assertTrue(self._proxy.isRunning()) + pass def testKillSuper(self): - self._proxy.ping() self._proxy.kill() self.assertFalse(self._proxy.isRunning()) self._proxy.ping() # Launching vdsm after kill self.assertTrue(self._proxy.isRunning()) def testNoPidFile(self): - self._proxy.ping() # svdsm is up - self.assertTrue(self._proxy.isRunning()) utils.rmFile(self._proxy.timestamp) self.assertFalse(self._proxy.isRunning()) + + def testZombieReaper(self): + reapedPid = self._proxy.ping() + sleep(10) # supervdsmServer checks SIGCHLD every 5 secs + self.assertRaises(OSError, os.waitpid, reapedPid, os.WNOHANG) diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 1287fef..56dd5fd 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -92,7 +92,8 @@ @logDecorator def ping(self, *args, **kwargs): # This method exists for testing purposes - return True + res = self._runAs(DISKIMAGE_USER, (DISKIMAGE_GROUP,), os.getpid) + return res @logDecorator def getDevicePartedInfo(self, *args, **kwargs): -- To view, visit http://gerrit.ovirt.org/9354 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fb8f3dcd575266febe11967e3f8df7d3588acb8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

5 15

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]: logging: setup log filter correctly
by zhshzhou＠linux.vnet.ibm.com 30 Oct '13

30 Oct '13

Zhou Zheng Sheng has uploaded a new change for review. Change subject: logging: setup log filter correctly ...................................................................... logging: setup log filter correctly logging.config.fileConfig() does not setup filters, it just setups loggers, handlers and formatters. dictConfig() can setup filters but the logging configuration is not very readable in a Python dict. This patch subclass the log handler to be filtered, in the __init__() method, add the filter need. Then in the logger.conf, use the subclass instead of the original handler. Change-Id: I76c2f77c95dd44853f070c8f7b7a8b71cfd6866c Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M vdsm/logUtils.py M vdsm/logger.conf.in 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/9688/1 diff --git a/vdsm/logUtils.py b/vdsm/logUtils.py index 933719d..8202bde 100644 --- a/vdsm/logUtils.py +++ b/vdsm/logUtils.py @@ -21,6 +21,7 @@ import logging import sys from functools import wraps +from logging.handlers import WatchedFileHandler from inspect import ismethod @@ -160,3 +161,17 @@ raise except: self.handleError(record) + + +def getFilteredClass(logHandlerClass, *filters): + class Filtered(logHandlerClass): + def __init__(self, *args, **kwargs): + logHandlerClass.__init__(self, *args, **kwargs) + for aFilter in filters: + self.addFilter(aFilter) + + return Filtered + + +FilteredWatchedFileHandler = getFilteredClass( + WatchedFileHandler, TracebackRepeatFilter()) diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index edd4616..cd42154 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -43,9 +43,8 @@ args=('/dev/log', handlers.SysLogHandler.LOG_USER) [handler_logfile] -class=logging.handlers.WatchedFileHandler +class=logUtils.FilteredWatchedFileHandler args=('@VDSMLOGDIR@/vdsm.log',) -filters=storage.misc.TracebackRepeatFilter level=DEBUG formatter=long -- To view, visit http://gerrit.ovirt.org/9688 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76c2f77c95dd44853f070c8f7b7a8b71cfd6866c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

3 10

← Newer
1
...
7
8
9
10
11
12
13
...
41
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012