vdsm-patches March 2013

vdsm-patches@lists.fedorahosted.org

51 participants
424 discussions

Change in vdsm[master]: [WIP] Towards a more (block) secure HSM.
by ewarszaw＠redhat.com 21 Jul '14

21 Jul '14

Eduardo has uploaded a new change for review. Change subject: [WIP] Towards a more (block) secure HSM. ...................................................................... [WIP] Towards a more (block) secure HSM. Change-Id: I30df4ee5cdb6b44cf14d8cb155436aac7442a07d --- M vdsm/storage/hsm.py M vdsm/storage/lvm.py M vdsm/storage/sp.py 3 files changed, 25 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/2218/1 -- To view, visit http://gerrit.ovirt.org/2218 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30df4ee5cdb6b44cf14d8cb155436aac7442a07d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

6 28

Change in vdsm[master]: [WIP] Implement a process to do dangerous IO in C
by smizrahi＠redhat.com 23 Jun '14

23 Jun '14

Saggi Mizrahi has uploaded a new change for review. Change subject: [WIP] Implement a process to do dangerous IO in C ...................................................................... [WIP] Implement a process to do dangerous IO in C This replaces the process pool with a process that can serve multiple requests written in C. This implementation is much more scalable and lightweight. Should solve bugs related to running out of helpers, logging getting suck, python forking deadlocking, running out of memory and other things as well. The communication between VDSM and the IOProcess is done with json objects. The IOProcess starts with 3 thread: 1. requestReader - reads requests from the pipe, builds a DOM representation of it and queues it up for handling 2. responseWriter - gets response DOMs from the queue converts them to a JSON string and send it over the pipe 3. requestHandler - pops requests from the queue and provisions threads for handling them. Currently we I just allocate a new thread per request. If there is ever a need to have a thread pool this is where the load balancing is going to sit. Each request gets the are as a JsonNode and returns a response that is a JsonNode as well. Most exported functions are pretty trivial and are a good example on how to write new ones. Unlink the ProcessPoolHelper, high level commands sit of the OopWrapper and are run from the client side instead of being implemented in C on the IOProcess side. Change-Id: Ie4664d5330debbe38ba33b74ebb586ac42913b4a Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M configure.ac M tests/Makefile.am A tests/ioprocessTests.py A tests/outOfProcessTests.py D tests/processPoolTests.py M vdsm.spec.in M vdsm/constants.py.in M vdsm/storage/Makefile.am M vdsm/storage/fileSD.py M vdsm/storage/fileUtils.py M vdsm/storage/fileVolume.py A vdsm/storage/ioprocess.py A vdsm/storage/ioprocess/.gitignore A vdsm/storage/ioprocess/Makefile.am A vdsm/storage/ioprocess/exported-functions.c A vdsm/storage/ioprocess/exported-functions.h A vdsm/storage/ioprocess/ioprocess.c A vdsm/storage/ioprocess/json-dom-generator.c A vdsm/storage/ioprocess/json-dom-generator.h A vdsm/storage/ioprocess/json-dom-parser.c A vdsm/storage/ioprocess/json-dom-parser.h A vdsm/storage/ioprocess/json-dom.c A vdsm/storage/ioprocess/json-dom.h M vdsm/storage/misc.py M vdsm/storage/nfsSD.py M vdsm/storage/outOfProcess.py D vdsm/storage/processPool.py M vdsm/storage/sd.py M vdsm/storage/sp.py M vdsm/storage/task.py 30 files changed, 3,018 insertions(+), 666 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/3946/1 -- To view, visit http://gerrit.ovirt.org/3946 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4664d5330debbe38ba33b74ebb586ac42913b4a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

4 11

Change in vdsm[master]: Move fencing logic out of API.py
by smizrahi＠redhat.com 23 Jun '14

23 Jun '14

Saggi Mizrahi has uploaded a new change for review. Change subject: Move fencing logic out of API.py ...................................................................... Move fencing logic out of API.py API.py should not contain logic. In this patch I also: - Separate the `status` action to a different function because it does something completely different from the other action and has different logic. - Refactor for better code reusability readability. - Use real exception internally and have the API layer translate them to actual exceptions. - Don't support port strings in methods, just in the interface. - Don't support string booleans in the methods, just in the interface. - Added shutdownEvent to ClientIF so there is a public standard way of inspecting vdsm shutdown. - Make the fencing logic use betterPopen Change-Id: I944c6548a42612f705a410fb4290215451bca035 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm.spec.in M vdsm/API.py M vdsm/Makefile.am M vdsm/clientIF.py 4 files changed, 25 insertions(+), 72 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/7190/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 23afd6b..f122cb5 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -558,6 +558,7 @@ %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* %{_datadir}/%{vdsm_name}/API.py* +%{_datadir}/%{vdsm_name}/fenceAgent.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* %{_datadir}/%{vdsm_name}/libvirtev.py* diff --git a/vdsm/API.py b/vdsm/API.py index ae04e01..5826d81 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -19,12 +19,9 @@ # import os -import signal import copy -import subprocess import pickle import time -import threading import logging from vdsm import utils @@ -40,6 +37,7 @@ from vdsm.define import doneCode, errCode, Kbytes, Mbytes import caps from vdsm.config import config +import fenceAgent import supervdsm @@ -981,82 +979,32 @@ agent is one of (rsa, ilo, drac5, ipmilan, etc) action can be one of (status, on, off, reboot).""" - def waitForPid(p, inp): - """ Wait until p.pid exits. Kill it if vdsm exists before. """ - try: - p.stdin.write(inp) - p.stdin.close() - while p.poll() is None: - if not self._cif._enabled: - self.log.debug('killing fence script pid %s', p.pid) - os.kill(p.pid, signal.SIGTERM) - time.sleep(1) - try: - # improbable race: p.pid may now belong to another - # process - os.kill(p.pid, signal.SIGKILL) - except: - pass - return - time.sleep(1) - self.log.debug('rc %s inp %s out %s err %s', p.returncode, - hidePasswd(inp), - p.stdout.read(), p.stderr.read()) - except: - self.log.error("Error killing fence script", exc_info=True) - - def hidePasswd(text): - cleantext = '' - for line in text.splitlines(True): - if line.startswith('passwd='): - line = 'passwd=XXXX\n' - cleantext += line - return cleantext - self.log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,' + 'passwd=%s,action=%s,secure=%s,options=%s)', addr, port, agent, username, 'XXXX', action, secure, options) - if action not in ('status', 'on', 'off', 'reboot'): - raise ValueError('illegal action ' + action) + secure = utils.tobool(secure) + port = int(port) - script = constants.EXT_FENCE_PREFIX + agent + if action == "status": + try: + power = fenceAgent.getFenceStatus(addr, port, agent, username, + password, secure, options) + + return {'status': doneCode, + 'power': power} + + except fenceAgent.FenceStatusCheckError as e: + return {'status': {'code': 1, 'message': str(e)}} try: - p = subprocess.Popen([script], stdin=subprocess.PIPE, - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - close_fds=True) - except OSError, e: - if e.errno == os.errno.ENOENT: - return errCode['fenceAgent'] - raise + fenceAgent.fenceNode(addr, port, agent, username, password, secure, + options, self._cif.shutdownEvent) - inp = ('agent=fence_%s\nipaddr=%s\nlogin=%s\noption=%s\n' + - 'passwd=%s\n') % (agent, addr, username, action, password) - if port != '': - inp += 'port=%s\n' % (port,) - if utils.tobool(secure): - inp += 'secure=yes\n' - inp += options - if action == 'status': - out, err = p.communicate(inp) - self.log.debug('rc %s in %s out %s err %s', p.returncode, - hidePasswd(inp), out, err) - if not 0 <= p.returncode <= 2: - return {'status': {'code': 1, - 'message': out + err}} - message = doneCode['message'] - if p.returncode == 0: - power = 'on' - elif p.returncode == 2: - power = 'off' - else: - power = 'unknown' - message = out + err - return {'status': {'code': 0, 'message': message}, - 'power': power} - threading.Thread(target=waitForPid, args=(p, inp)).start() - return {'status': doneCode} + return {'status': doneCode} + + except fenceAgent.UnsupportedFencingAgentError: + return errCode['fenceAgent'] def ping(self): "Ping the server. Useful for tests" diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 62ba982..4a7bc57 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -32,6 +32,7 @@ clientIF.py \ configNetwork.py \ debugPluginClient.py \ + fenceAgent.py \ guestIF.py \ hooking.py \ hooks.py \ @@ -52,7 +53,8 @@ tc.py \ vdsmDebugPlugin.py \ vmChannels.py \ - vm.py + vm.py \ + $(NULL) dist_vdsmpylib_PYTHON = \ __init__.py \ diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 8ba25a7..8760437 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -96,6 +96,7 @@ self.lastRemoteAccess = 0 self._memLock = threading.Lock() self._enabled = True + self.shutdownEvent = threading.Event() self._netConfigDirty = False self._prepareMOM() threading.Thread(target=self._recoverExistingVms, @@ -219,6 +220,7 @@ for binding in self.bindings.values(): binding.prepareForShutdown() self._enabled = False + self.shutdownEvent.set() self.channelListener.stop() self._hostStats.stop() if self.mom: -- To view, visit http://gerrit.ovirt.org/7190 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I944c6548a42612f705a410fb4290215451bca035 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

7 23

Change in vdsm[master]: [WIP] metaSize calculation as a module function.
by ewarszaw＠redhat.com 23 Jun '14

23 Jun '14

Eduardo has uploaded a new change for review. Change subject: [WIP] metaSize calculation as a module function. ...................................................................... [WIP] metaSize calculation as a module function. Change-Id: If90ba75d11c4962f2e52150e5f381cd93d0e8f35 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/11690/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 9b9674e..aa4059a 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -269,6 +269,27 @@ return +def metaSize(vgName): + ''' Calc the minimal meta volume size in MB''' + # In any case the metadata volume cannot be less than 512MB for the + # case of 512 bytes per volume metadata, 2K for domain metadata and + # extent size of 128MB. In any case we compute the right size on line. + vg = lvm.getVG(vgName) + minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + + (1024 * 1024 - 1)) / (1024 * 1024) + metaratio = int(vg.extent_size) / sd.METASIZE + metasize = (int(vg.extent_count) * sd.METASIZE + + (1024 * 1024 - 1)) / (1024 * 1024) + metasize = max(minmetasize, metasize) + if metasize > int(vg.free) / (1024 * 1024): + raise se.VolumeGroupSizeError("volume group has not enough extents %s" + " (Minimum %s), VG may be too small" % + (vg.extent_count, + (1024 * 1024) / sd.METASIZE)) + log.info("size %s MB (metaratio %s)" % (metasize, metaratio)) + return metasize + + class VGTagMetadataRW(object): log = logging.getLogger("storage.Metadata.VGTagMetadataRW") METADATA_TAG_PREFIX = "MDT_" @@ -449,27 +470,6 @@ lvmActivationNamespace) @classmethod - def metaSize(cls, vgroup): - ''' Calc the minimal meta volume size in MB''' - # In any case the metadata volume cannot be less than 512MB for the - # case of 512 bytes per volume metadata, 2K for domain metadata and - # extent size of 128MB. In any case we compute the right size on line. - vg = lvm.getVG(vgroup) - minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + - (1024 * 1024 - 1)) / (1024 * 1024) - metaratio = int(vg.extent_size) / sd.METASIZE - metasize = (int(vg.extent_count) * sd.METASIZE + - (1024 * 1024 - 1)) / (1024 * 1024) - metasize = max(minmetasize, metasize) - if metasize > int(vg.free) / (1024 * 1024): - raise se.VolumeGroupSizeError( - "volume group has not enough extents %s (Minimum %s), VG may " - "be too small" % (vg.extent_count, - (1024 * 1024) / sd.METASIZE)) - cls.log.info("size %s MB (metaratio %s)" % (metasize, metaratio)) - return metasize - - @classmethod def create(cls, sdUUID, domainName, domClass, vgUUID, storageType, version): """ Create new storage domain @@ -509,7 +509,7 @@ raise se.StorageDomainIsMadeFromTooManyPVs() # Create metadata service volume - metasize = cls.metaSize(vgName) + metasize = metaSize(vgName) lvm.createLV(vgName, sd.METADATA, "%s" % (metasize)) # Create the mapping right now so the index 0 is guaranteed # to belong to the metadata volume. Since the metadata is at @@ -721,7 +721,7 @@ lvm.extendVG(self.sdUUID, devices, force) self.updateMapping() - newsize = self.metaSize(self.sdUUID) + newsize = metaSize(self.sdUUID) lvm.extendLV(self.sdUUID, sd.METADATA, newsize) def mapMetaOffset(self, vol_name, slotSize): -- To view, visit http://gerrit.ovirt.org/11690 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If90ba75d11c4962f2e52150e5f381cd93d0e8f35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

4 14

Change in vdsm[master]: [WIP]add createVm support of cputune
by lvroyce＠linux.vnet.ibm.com 23 Jun '14

23 Jun '14

Royce Lv has uploaded a new change for review. Change subject: [WIP]add createVm support of cputune ...................................................................... [WIP]add createVm support of cputune allow engine to pass other cputune params through vm create, createVm now uses nice to config vm share value, this patch uses 'shares' in vmdef directly (1024 by default) Change-Id: I76e9b9d291d4801965163774ba45d15b39a77471 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/libvirtvm.py 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/8445/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index fd80c69..9b38a36 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -737,10 +737,13 @@ self.dom.appendChild(cpu) def appendTunable(self): - #CPU-pinning support - # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning + cputune = self.doc.createElement('cputune') + cputuneParams = {'shares':1024} + if 'cputune' in self.conf: + cputuneParam = self.conf['cputune'] if 'cpuPinning' in self.conf: - cputune = self.doc.createElement('cputune') + #CPU-pinning support + # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning cpuPinning = self.conf.get('cpuPinning') try: emulatorset = cpuPinning.pop('emulator') @@ -754,7 +757,13 @@ vcpupin.setAttribute('vcpu', cpuPin) vcpupin.setAttribute('cpuset', cpuPinning[cpuPin]) cputune.appendChild(vcpupin) - self.dom.appendChild(cputune) + + for item in cputuneParams.keys(): + m = self.doc.createElement(item) + m.appendChild(self.doc.createTextNode(cputuneParams[item])) + cputune.appendChild(m) + + self.dom.appendChild(cputune) def _appendAgentDevice(self, path, name): """ @@ -1338,13 +1347,6 @@ if self._initTimePauseCode == 'ENOSPC': self.cont() self.conf['pid'] = self._getPid() - - nice = int(self.conf.get('nice', '0')) - nice = max(min(nice, 19), 0) - try: - self._dom.setSchedulerParameters({'cpu_shares': (20 - nice) * 51}) - except: - self.log.warning('failed to set Vm niceness', exc_info=True) def _run(self): self.log.info("VM wrapper has started") -- To view, visit http://gerrit.ovirt.org/8445 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76e9b9d291d4801965163774ba45d15b39a77471 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

11 37

Change in vdsm[master]: spec: update sanlock dependencies
by Federico Simoncelli 02 Jun '14

02 Jun '14

Federico Simoncelli has uploaded a new change for review. Change subject: spec: update sanlock dependencies ...................................................................... spec: update sanlock dependencies Forcing some old fedora installations to update sanlock to the latest version. This is mostly to address: - wdmd: dynamically select working watchdog device which makes it possible to run sanlock on hardware (generally laptops) with multiple watchdogs. Change-Id: Ia9a28d7bf23ab93781bdf3d8cf5769fe149fdeb4 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/12292/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 38838ea..89da7af 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -107,7 +107,7 @@ Requires: device-mapper-multipath >= 0.4.9-52 Requires: e2fsprogs >= 1.41.12-11 Requires: kernel >= 2.6.32-279.9.1 -Requires: sanlock >= 2.3-4, sanlock-python +Requires: sanlock >= 2.3-4 Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: mom >= 0.3.0 Requires: selinux-policy-targeted >= 3.7.19-155 @@ -125,7 +125,7 @@ Requires: e2fsprogs >= 1.41.14 Requires: kernel >= 3.6 Requires: mom >= 0.3.0 -Requires: sanlock >= 2.4-2, sanlock-python +Requires: sanlock >= 2.6-4 Requires: sed >= 4.2.1-10 Requires: selinux-policy-targeted >= 3.10.0-149 Requires: lvm2 >= 2.02.95 @@ -151,6 +151,7 @@ Requires: libselinux-python Requires: %{name}-python = %{version}-%{release} Requires: pyparted +Requires: sanlock-python Requires(post): /usr/sbin/saslpasswd2 Requires(post): /bin/hostname -- To view, visit http://gerrit.ovirt.org/12292 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9a28d7bf23ab93781bdf3d8cf5769fe149fdeb4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 8

Change in vdsm[master]: [WIP] Small objects repository file implementation
by Federico Simoncelli 19 May '14

19 May '14

Federico Simoncelli has uploaded a new change for review. Change subject: [WIP] Small objects repository file implementation ...................................................................... [WIP] Small objects repository file implementation Change-Id: I3003f8652a58c68a966bc37e591c1d1d2308c164 --- M vdsm/storage/fileSD.py M vdsm/storage/hsm.py M vdsm/storage/outOfProcess.py M vdsm/storage/sd.py M vdsm/storage/sp.py M vdsm_cli/vdsClient.py 6 files changed, 83 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/242/1 -- To view, visit http://gerrit.ovirt.org/242 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3003f8652a58c68a966bc37e591c1d1d2308c164 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

2 2

Change in vdsm[master]: Add a chown implementation that looks up uid and gid
by Federico Simoncelli 19 May '14

19 May '14

Federico Simoncelli has uploaded a new change for review. Change subject: Add a chown implementation that looks up uid and gid ...................................................................... Add a chown implementation that looks up uid and gid We already have a case in vdsm (configNetwork) where we need to use a chown function that is capable to convert the owner and group names to uid and gid. Going forward this can be reused for the deployment utilities and to prepare the paths needed by vdsm (eg: /rhev and /var/run/vdsm). Change-Id: Iab6f67ba93a0d9cbac775992623f3bb2ab996555 --- M vdsm/configNetwork.py M vdsm/utils.py 2 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/387/1 -- To view, visit http://gerrit.ovirt.org/387 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab6f67ba93a0d9cbac775992623f3bb2ab996555 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

4 6

Change in vdsm[master]: Move fenceNode out of API.py
by smizrahi＠redhat.com 19 May '14

19 May '14

Saggi Mizrahi has uploaded a new change for review. Change subject: Move fenceNode out of API.py ...................................................................... Move fenceNode out of API.py The actual details of how the response is mangles is part of the bindings so API.py really doesn't serve a purpose. This is the first step in a general trend of moving the logic out of API.py to dedicated modules and move the response mangling to the binding wrappers. Change-Id: Idaba551333a0f289abaff11dc113e09c426d591a Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/API.py M vdsm/BindingXMLRPC.py 2 files changed, 25 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/7191/1 diff --git a/vdsm/API.py b/vdsm/API.py index 5826d81..4fdc7e7 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -37,7 +37,6 @@ from vdsm.define import doneCode, errCode, Kbytes, Mbytes import caps from vdsm.config import config -import fenceAgent import supervdsm @@ -972,40 +971,6 @@ APIBase.__init__(self) # General Host functions - def fenceNode(self, addr, port, agent, username, password, action, - secure=False, options=''): - """Send a fencing command to a remote node. - - agent is one of (rsa, ilo, drac5, ipmilan, etc) - action can be one of (status, on, off, reboot).""" - - self.log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,' + - 'passwd=%s,action=%s,secure=%s,options=%s)', addr, port, agent, - username, 'XXXX', action, secure, options) - - secure = utils.tobool(secure) - port = int(port) - - if action == "status": - try: - power = fenceAgent.getFenceStatus(addr, port, agent, username, - password, secure, options) - - return {'status': doneCode, - 'power': power} - - except fenceAgent.FenceStatusCheckError as e: - return {'status': {'code': 1, 'message': str(e)}} - - try: - fenceAgent.fenceNode(addr, port, agent, username, password, secure, - options, self._cif.shutdownEvent) - - return {'status': doneCode} - - except fenceAgent.UnsupportedFencingAgentError: - return errCode['fenceAgent'] - def ping(self): "Ping the server. Useful for tests" return {'status': doneCode} diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 48f4723..7eee29e 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -32,6 +32,8 @@ from vdsm.define import doneCode, errCode import API from vdsm.exception import VdsmException +import fenceAgent + try: from gluster.api import getGlusterMethods _glusterEnabled = True @@ -355,9 +357,29 @@ def fenceNode(self, addr, port, agent, username, password, action, secure=False, options=''): - api = API.Global() - return api.fenceNode(addr, port, agent, username, password, - action, secure, options) + + secure = utils.tobool(secure) + port = int(port) + + if action == "status": + try: + power = fenceAgent.getFenceStatus(addr, port, agent, username, + password, secure, options) + + return {'status': doneCode, + 'power': power} + + except fenceAgent.FenceStatusCheckError as e: + return {'status': {'code': 1, 'message': str(e)}} + + try: + fenceAgent.fenceNode(addr, port, agent, username, password, secure, + options, self.cif.shutdownEvent) + + return {'status': doneCode} + + except fenceAgent.UnsupportedFencingAgentError: + return errCode['fenceAgent'] def setLogLevel(self, level): api = API.Global() -- To view, visit http://gerrit.ovirt.org/7191 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaba551333a0f289abaff11dc113e09c426d591a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

6 12

Change in vdsm[master]: More safe startSpm().
by ewarszaw＠redhat.com 19 May '14

19 May '14

Eduardo has uploaded a new change for review. Change subject: More safe startSpm(). ...................................................................... More safe startSpm(). Change-Id: I1e6b32bdf1dd8dc36f6633306d4edef89d542e31 --- M vdsm/storage/sp.py 1 file changed, 16 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/451/1 -- To view, visit http://gerrit.ovirt.org/451 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e6b32bdf1dd8dc36f6633306d4edef89d542e31 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

3 4

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches March 2013