vdsm-patches December 2013

vdsm-patches@lists.fedorahosted.org

48 participants
493 discussions

Change in vdsm[master]: fix Exception message error in apiTests module
by shaohef＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

ShaoHe Feng has uploaded a new change for review. Change subject: fix Exception message error in apiTests module ...................................................................... fix Exception message error in apiTests module Change-Id: Ic51b141047dc0490e50a050fd667f63d30f121f2 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M tests/apiTests.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/11289/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index 1c8699e..0ac3177 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -203,22 +203,22 @@ try: sock.connect((ip, port)) except socket.error as e: - raise ConnectionError("Unable to connect to server: %s", e) + raise ConnectionError("Unable to connect to server: %s" % e) try: sock.sendall(msg) except (socket.error, socket.timeout), e: - raise ProtocolError("Unable to send request: %s", e) + raise ProtocolError("Unable to send request: %s" % e) try: data = sock.recv(JsonRawTest._Size.size) except socket.error as e: - raise ProtocolError("Unable to read response length: %s", e) + raise ProtocolError("Unable to read response length: %s" % e) if not data: raise ProtocolError("No data received") msgLen = JsonRawTest._Size.unpack(data)[0] try: data = sock.recv(msgLen) except socket.error as e: - raise ProtocolError("Unable to read response body: %s", e) + raise ProtocolError("Unable to read response body: %s" % e) if len(data) != msgLen: raise ProtocolError("Response body length mismatch") return json.loads(data) -- To view, visit http://gerrit.ovirt.org/11289 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic51b141047dc0490e50a050fd667f63d30f121f2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

5 18

Change in vdsm[master]: Changing the order of the services management alternatives
by ybronhei＠redhat.com 14 Jan '14

14 Jan '14

Yaniv Bronhaim has uploaded a new change for review. Change subject: Changing the order of the services management alternatives ...................................................................... Changing the order of the services management alternatives Prefer initctl, then systemctl Change-Id: I678cee34d02ebbdcccd49f4c95cca9aa90f6fab3 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M lib/vdsm/tool/service.py 1 file changed, 66 insertions(+), 64 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/22867/1 diff --git a/lib/vdsm/tool/service.py b/lib/vdsm/tool/service.py index ee6a9cd..505a385 100644 --- a/lib/vdsm/tool/service.py +++ b/lib/vdsm/tool/service.py @@ -98,73 +98,10 @@ pass -try: - _SYSTEMCTL.cmd -except OSError: - pass -else: - def _systemctlNative(systemctlFun): - @functools.wraps(systemctlFun) - def wrapper(srvName): - cmd = [_SYSTEMCTL.cmd, "--no-pager", "list-unit-files"] - rc, out, err = execCmd(cmd, raw=False) - if rc != 0: - raise ServiceOperationError( - "Error listing unit files", '\n'.join(out), '\n'.join(err)) - fullName = srvName + ".service" - for line in out: - if fullName == line.split(" ", 1)[0]: - return systemctlFun(fullName) - raise ServiceNotExistError("%s is not native systemctl service" % - srvName) - return wrapper - - @_systemctlNative - def _systemctlStart(srvName): - cmd = [_SYSTEMCTL.cmd, "start", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlStop(srvName): - cmd = [_SYSTEMCTL.cmd, "stop", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlStatus(srvName): - cmd = [_SYSTEMCTL.cmd, "status", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlRestart(srvName): - cmd = [_SYSTEMCTL.cmd, "restart", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlReload(srvName): - cmd = [_SYSTEMCTL.cmd, "reload", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlDisable(srvName): - cmd = [_SYSTEMCTL.cmd, "disable", srvName] - return execCmd(cmd) - - @_systemctlNative - def _systemctlIsManaged(srvName): - return (0, '', '') - - _srvStartAlts.append(_systemctlStart) - _srvStopAlts.append(_systemctlStop) - _srvStatusAlts.append(_systemctlStatus) - _srvRestartAlts.append(_systemctlRestart) - _srvReloadAlts.append(_systemctlReload) - _srvDisableAlts.append(_systemctlDisable) - _srvIsManagedAlts.append(_systemctlIsManaged) - - def _isStopped(message): stopRegex = r"\bstopped\b|\bstop\b|\bwaiting\b|\bnot running\b" return bool(re.search(stopRegex, message, re.MULTILINE)) + try: _INITCTL.cmd @@ -258,6 +195,71 @@ raise ServiceNotExistError("%s is not a SysV service" % srvName) return wrapper + +try: + _SYSTEMCTL.cmd +except OSError: + pass +else: + def _systemctlNative(systemctlFun): + @functools.wraps(systemctlFun) + def wrapper(srvName): + cmd = [_SYSTEMCTL.cmd, "--no-pager", "list-unit-files"] + rc, out, err = execCmd(cmd, raw=False) + if rc != 0: + raise ServiceOperationError( + "Error listing unit files", '\n'.join(out), '\n'.join(err)) + fullName = srvName + ".service" + for line in out: + if fullName == line.split(" ", 1)[0]: + return systemctlFun(fullName) + raise ServiceNotExistError("%s is not native systemctl service" % + srvName) + return wrapper + + @_systemctlNative + def _systemctlStart(srvName): + cmd = [_SYSTEMCTL.cmd, "start", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlStop(srvName): + cmd = [_SYSTEMCTL.cmd, "stop", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlStatus(srvName): + cmd = [_SYSTEMCTL.cmd, "status", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlRestart(srvName): + cmd = [_SYSTEMCTL.cmd, "restart", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlReload(srvName): + cmd = [_SYSTEMCTL.cmd, "reload", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlDisable(srvName): + cmd = [_SYSTEMCTL.cmd, "disable", srvName] + return execCmd(cmd) + + @_systemctlNative + def _systemctlIsManaged(srvName): + return (0, '', '') + + _srvStartAlts.append(_systemctlStart) + _srvStopAlts.append(_systemctlStop) + _srvStatusAlts.append(_systemctlStatus) + _srvRestartAlts.append(_systemctlRestart) + _srvReloadAlts.append(_systemctlReload) + _srvDisableAlts.append(_systemctlDisable) + _srvIsManagedAlts.append(_systemctlIsManaged) + + try: _SERVICE.cmd except OSError: -- To view, visit http://gerrit.ovirt.org/22867 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I678cee34d02ebbdcccd49f4c95cca9aa90f6fab3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 10

Change in vdsm[master]: add rollback to _runVMKernelBootTemplate
by lvroyce＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

Royce Lv has uploaded a new change for review. Change subject: add rollback to _runVMKernelBootTemplate ...................................................................... add rollback to _runVMKernelBootTemplate This will enable us checking status of VM after it starts up. Change-Id: I497d36bb051d904ae1e43bc8f565707f411a3851 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M tests/functional/xmlrpcTests.py 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/12819/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index b9ec45b..3eb65e4 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -166,9 +166,10 @@ customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222', 'vmName': 'vdsm_testSmallVM'} - self._runVMKernelBootTemplate(customization) + with RollbackContext() as rollback: + self._runVMKernelBootTemplate(rollback, customization) - def _runVMKernelBootTemplate(self, vmDef={}, distro='fedora'): + def _runVMKernelBootTemplate(self, rollback, vmDef={}, distro='fedora'): kernelArgsDistro = { # Fedora: The initramfs is generated by dracut. The following # arguments will be interpreted by init scripts created by dracut. @@ -196,14 +197,13 @@ template.update( {'kernel': kernelPath, 'initrd': initramfsPath}) - try: - self.assertVdsOK(self.s.create(template)) - # wait 65 seconds for VM to come up until timeout - self.retryAssert(assertVMAndGuestUp, timeout=65) - finally: - destroyResult = self.s.destroy(vmid) - self.assertVdsOK(destroyResult) + self.assertVdsOK(self.s.create(template)) + # wait 65 seconds for VM to come up until timeout + self.retryAssert(assertVMAndGuestUp, timeout=65) + undo = lambda vmid=vmid: \ + self.assertVdsOK(self.s.destroy(vmid)) + rollback.prependDefer(undo) @permutations([['localfs'], ['iscsi'], ['glusterfs']]) def testStorage(self, backendType): @@ -235,7 +235,7 @@ with RollbackContext() as rollback: self._createVdsmStorageLayout(conf, rollback) - self._runVMKernelBootTemplate(customization) + self._runVMKernelBootTemplate(rollback, customization) def _createVdsmStorageLayout(self, conf, rollback): backendServer = conf['server'](self.s, self) -- To view, visit http://gerrit.ovirt.org/12819 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I497d36bb051d904ae1e43bc8f565707f411a3851 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

5 11

Change in vdsm[master]: glusterSD: BZ 988299: Deduce gluster volume name from domain...
by deepakcs＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

Deepak C Shetty has uploaded a new change for review. Change subject: glusterSD: BZ 988299: Deduce gluster volume name from domain metadata ...................................................................... glusterSD: BZ 988299: Deduce gluster volume name from domain metadata Gluster volume name thats present as part of mount point path is mangled, hence gluster volume lookup fails if volume has '_' or '/' in it. Use the pristine value of server:volname stored in domain metadata to deduce the gluster volume name. Change-Id: Ibfc8af4aa7ab028a7a6f0e691eae1c89f5148ee9 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=988299 Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- M vdsm/storage/glusterVolume.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/19219/1 diff --git a/vdsm/storage/glusterVolume.py b/vdsm/storage/glusterVolume.py index 3368de3..1a1b40e 100644 --- a/vdsm/storage/glusterVolume.py +++ b/vdsm/storage/glusterVolume.py @@ -3,6 +3,7 @@ from sdc import sdCache import supervdsm as svdsm from gluster.exception import GlusterException +from fileSD import REMOTE_PATH class GlusterVolume(fileVolume.FileVolume): @@ -15,10 +16,18 @@ """ Send info to represent Gluster volume as a network block device """ - rpath = sdCache.produce(self.sdUUID).getRemotePath() + + # Get the pristine remote path (hostname:volname) from MD, + # so that we don't end up using the mangled volume and/or hostnames. + rpath = sdCache.produce(self.sdUUID).getMetaParam(REMOTE_PATH) rpath_list = rpath.rsplit(":", 1) volfileServer = rpath_list[0] - volname = rpath_list[1] + # Check for leading '/', since its perfectly valid to say + # hostname:/volname for gluster mounts. + if rpath_list[1][0] == '/': + volname = rpath_list[1][1:] + else: + volname = rpath_list[1] # Volume transport to Libvirt transport mapping VOLUME_TRANS_MAP = {'TCP': 'tcp', 'RDMA': 'rdma'} -- To view, visit http://gerrit.ovirt.org/19219 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfc8af4aa7ab028a7a6f0e691eae1c89f5148ee9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com>

4 6

Change in vdsm[master]: add emulator pin support to create vm
by lvroyce＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

Royce Lv has uploaded a new change for review. Change subject: add emulator pin support to create vm ...................................................................... add emulator pin support to create vm move cpupin to a seperate function 'appendTunable' to add cputune(e.g.cpu_share),memtune limit def when create vm. add emulator pin support to create vm, then the cpuPinning dict changs to be: {0:'1-4','emulator':'2'} Change-Id: Ic616b825eca94682e1563ab51773d8a23351998d Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/libvirtvm.py 1 file changed, 21 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/8411/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 64a3b6b..fd80c69 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -716,18 +716,6 @@ topo.setAttribute('threads', str(threads)) cpu.appendChild(topo) - #CPU-pinning support - # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning - if 'cpuPinning' in self.conf: - cputune = self.doc.createElement('cputune') - cpuPinning = self.conf.get('cpuPinning') - for cpuPin in cpuPinning.keys(): - vcpupin = self.doc.createElement('vcpupin') - vcpupin.setAttribute('vcpu', cpuPin) - vcpupin.setAttribute('cpuset', cpuPinning[cpuPin]) - cputune.appendChild(vcpupin) - self.dom.appendChild(cputune) - # This hack is for backward compatibility as the libvirt does not allow # 'qemu64' guest on intel hardware if model == 'qemu64' and not '+svm' in features: @@ -747,6 +735,26 @@ f.setAttribute('name', feature[1:]) cpu.appendChild(f) self.dom.appendChild(cpu) + + def appendTunable(self): + #CPU-pinning support + # see http://www.ovirt.org/wiki/Features/Design/cpu-pinning + if 'cpuPinning' in self.conf: + cputune = self.doc.createElement('cputune') + cpuPinning = self.conf.get('cpuPinning') + try: + emulatorset = cpuPinning.pop('emulator') + emulatorpin = self.doc.createElement('emulatorpin') + emulatorpin.setAttribute('cpuset', emulatorset) + cputune.appendChild(emulatorpin) + except: + pass + for cpuPin in cpuPinning.keys(): + vcpupin = self.doc.createElement('vcpupin') + vcpupin.setAttribute('vcpu', cpuPin) + vcpupin.setAttribute('cpuset', cpuPinning[cpuPin]) + cputune.appendChild(vcpupin) + self.dom.appendChild(cputune) def _appendAgentDevice(self, path, name): """ @@ -1230,6 +1238,7 @@ domxml.appendClock() domxml.appendFeatures() domxml.appendCpu() + domxml.appendTunable() if utils.tobool(self.conf.get('vmchannel', 'true')): domxml._appendAgentDevice( self._guestSocketFile.decode('utf-8'), -- To view, visit http://gerrit.ovirt.org/8411 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic616b825eca94682e1563ab51773d8a23351998d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

7 32

Change in vdsm[master]: force reload udev rules to avoid LUN device permission error
by lvroyce＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

Royce Lv has uploaded a new change for review. Change subject: force reload udev rules to avoid LUN device permission error ...................................................................... force reload udev rules to avoid LUN device permission error udev rules creat symlink for LUN device making it usable for qemu but the rules are not instantly loaded by udev result in LUN device symlink not created before vm run force reload to make the rules take effect instantly Change-Id: I718d62e67b0a228f2510233c5dd9d1d94c4a736c Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/storage/hsm.py M vdsm/supervdsmServer.py 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/6780/1 -- To view, visit http://gerrit.ovirt.org/6780 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I718d62e67b0a228f2510233c5dd9d1d94c4a736c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

8 21

Change in vdsm[master]: Encapsulate vdsm-unregister into vdsm-tool function
by lilei＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

Lei Li has uploaded a new change for review. Change subject: Encapsulate vdsm-unregister into vdsm-tool function ...................................................................... Encapsulate vdsm-unregister into vdsm-tool function Change-Id: I7348baeabbdcbb0c2da64170b6957430feaa1954 Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- M vdsm-tool/Makefile.am A vdsm-tool/register.py M vdsm.spec.in 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/4527/1 -- To view, visit http://gerrit.ovirt.org/4527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7348baeabbdcbb0c2da64170b6957430feaa1954 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Lei Li <lilei(a)linux.vnet.ibm.com>

6 9

Change in vdsm[master]: add a jsonrpcSeverClient for jsonRPC Server functional test
by shaohef＠linux.vnet.ibm.com 14 Jan '14

14 Jan '14

ShaoHe Feng has uploaded a new change for review. Change subject: add a jsonrpcSeverClient for jsonRPC Server functional test ...................................................................... add a jsonrpcSeverClient for jsonRPC Server functional test This jsonrpcSeverClient is easy to call the jsonRPC server. And it is an example for user to call the jsonRPC server. The jsonrpcSeverClient will parser the vdsmapi-schema.json. It will generate the method of vdsm-api dynamically. Then we can easy call the vdsm-api, refer to vdsm-api.html. vdsm-api.html is in the vdsm doc path. Some comments tell us how to call the vdsm-api at the end of jsonrpcSeverClient.py Change-Id: Ib081e26203638114d7d632489432a50eeea45dd4 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M tests/functional/Makefile.am A tests/functional/jsonrpcSeverClient.py 2 files changed, 144 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/11283/1 diff --git a/tests/functional/Makefile.am b/tests/functional/Makefile.am index 030242b..e3374e8 100644 --- a/tests/functional/Makefile.am +++ b/tests/functional/Makefile.am @@ -21,6 +21,7 @@ vdsmfunctestsdir = ${vdsmtestsdir}/functional dist_vdsmfunctests_PYTHON = \ + jsonrpcSeverClient.py \ momTests.py \ sosPluginTests.py \ xmlrpcTests.py \ diff --git a/tests/functional/jsonrpcSeverClient.py b/tests/functional/jsonrpcSeverClient.py new file mode 100644 index 0000000..77af03b --- /dev/null +++ b/tests/functional/jsonrpcSeverClient.py @@ -0,0 +1,143 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +import json +import os +import socket +import ssl +import struct +import vdsmapi +from functools import partial +from contextlib import closing +from vdsm.config import config +from vdsm import constants + + +class ConnectionError(Exception): + pass + + +class ProtocolError(Exception): + pass + + +class jsonRpcServerClient(object): + + #TODO: spport ssl + def __init__(self, ip, port, certReq=False, tsPath=None): + self._ip = ip + self._port = port + self._tsPath = tsPath + self._Size = struct.Struct("!Q") + self._cert_reqs = ssl.CERT_REQUIRED if certReq else ssl.CERT_NONE + schema = os.path.join(constants.P_VDSM, 'vdsmapi-schema.json') + self._dynamicAttribute(schema) + + def buildMessage(self, data): + msg = json.dumps(data) + msg = msg.encode('utf-8') + msize = self._Size.pack(len(msg)) + resp = msize + msg + return resp + + def _createRequest(self, method, reqId=None, params=()): + return {'jsonrpc': '2.0', "id": reqId, "method": method, + "params": params} + + def sendMessage(self, msg): + with closing(socket.socket(socket.AF_INET, + socket.SOCK_STREAM)) as tcp_sock: + if self._cert_reqs == ssl.CERT_REQUIRED: + if self._tsPath is None: + self._tsPath = config.get('vars', 'trust_store_path') + KEYFILE = self._tsPath + '/keys/vdsmkey.pem' + CERTFILE = self._tsPath + '/certs/vdsmcert.pem' + CACERT = self._tsPath + '/certs/cacert.pem' + sock = ssl.wrap_socket(tcp_sock, + keyfile=KEYFILE, + certfile=CERTFILE, + ca_certs=CACERT, + cert_reqs=self._cert_reqs) + else: + sock = tcp_sock + sock.settimeout(3) # TBD timeout + try: + sock.connect((self._ip, self._port)) + except socket.error as e: + raise ConnectionError("Unable to connect to server: %s", e) + try: + sock.sendall(msg) + except (socket.error, socket.timeout), e: + raise ProtocolError("Unable to send request: %s", e) + try: + data = sock.recv(self._Size.size) + except socket.error as e: + raise ProtocolError("Unable to read response length: %s", e) + if not data: + raise ProtocolError("No data received") + msgLen = self._Size.unpack(data)[0] + try: + data = sock.recv(msgLen) + except socket.error as e: + raise ProtocolError("Unable to read response body: %s", e) + if len(data) != msgLen: + raise ProtocolError("Response body length mismatch") + return json.loads(data) + + def call(self, method, reqId=None, params=()): + msg = self.buildMessage(self._createRequest(method, reqId, params)) + reply = self.sendMessage(msg) + return reply + + def _dynamicAttribute(self, schema): + self.dynamicAttr = {} + with open(schema) as f: + symbols = vdsmapi.parse_schema(f) + for s in symbols: + if 'command' in s: + className = s['command']['class'] + functionName = s['command']['name'] + if className not in self.dynamicAttr.keys(): + self.dynamicAttr[className] = [] + self.dynamicAttr[className].append(functionName) + for key, funs in self.dynamicAttr.items(): + funDicts = {} + for fun in funs: + method = ".".join((key, fun)) + funDicts[fun] = partial(self.call, method) + cls = type(key, (object,), funDicts) + setattr(self, key, cls()) + + +if __name__ == '__main__': + if not config.getboolean('vars', 'jsonrpc_enable'): + exit(1) + + ip = "127.0.0.1" + port = config.getint('addresses', 'json_port') + rpcIns = jsonRpcServerClient(ip, port) + + # test the RpcClient + # you can open vdsm-api.html by your browser, such as by firefox + # firefox /usr/share/doc/vdsm-*/vdsm-api.html + # vdsm-api.html is in the vdsm doc path. + # then can call the API show in vdsm-api.html as follow + print rpcIns.call("Host.getAllTasksInfo", 1) + print rpcIns.Host.getAllTasksInfo(1) -- To view, visit http://gerrit.ovirt.org/11283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib081e26203638114d7d632489432a50eeea45dd4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

6 53

Change in vdsm[master]: sp: improve masterMigrate safety
by Federico Simoncelli 13 Jan '14

13 Jan '14

Federico Simoncelli has uploaded a new change for review. Change subject: sp: improve masterMigrate safety ...................................................................... sp: improve masterMigrate safety The goal of this patch is to clean, optimize and give robustness to the masterMigrate method. In this patch: - acquire the cluster lock before start using the new master filesystem - refactor out all the required metadata changes in switchMasterDomain (rename copyPoolMD to switchMasterDomain, and include the domain role changes) - divde the method in two parts (operations required to switch to the new master and previous master cleanup) - address the two parts exception handling (hard failure for the first, logging only for the second) Change-Id: I155b36d41df43230f99ba610699bba05bee3f0c0 Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 61 insertions(+), 78 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/22419/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 19d07b3..c370b52 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -836,27 +836,29 @@ else: futureMaster.releaseClusterLock() - @unsecured - def copyPoolMD(self, prevMd, newMD): - prevPoolMD = self._getPoolMD(prevMd) + def switchMasterDomain(self, currentMasterDomain, newMasterDomain, + newMasterVersion): + prevPoolMD = self._getPoolMD(currentMasterDomain) domains = prevPoolMD[PMDK_DOMAINS] pool_descr = prevPoolMD[PMDK_POOL_DESCRIPTION] lver = prevPoolMD[PMDK_LVER] spmId = prevPoolMD[PMDK_SPM_ID] # This is actually domain metadata, But I can't change this because of # backward compatibility - leaseParams = prevMd.getLeaseParams() + leaseParams = currentMasterDomain.getLeaseParams() # Now insert pool metadata into new mastersd metadata - newPoolMD = self._getPoolMD(newMD) + newPoolMD = self._getPoolMD(newMasterDomain) with newPoolMD.transaction(): newPoolMD.update({ PMDK_DOMAINS: domains, PMDK_POOL_DESCRIPTION: pool_descr, PMDK_LVER: lver, - PMDK_SPM_ID: spmId}) - newMD.changeLeaseParams(leaseParams) + PMDK_SPM_ID: spmId, + PMDK_MASTER_VER: newMasterVersion, + }) + newMasterDomain.changeLeaseParams(leaseParams) @unsecured def _copyLeaseParameters(self, srcDomain, dstDomain): @@ -865,7 +867,6 @@ srcDomain.sdUUID, leaseParams) dstDomain.changeLeaseParams(leaseParams) - @unsecured def masterMigrate(self, sdUUID, msdUUID, masterVersion): self.log.info("sdUUID=%s spUUID=%s msdUUID=%s", sdUUID, self.spUUID, msdUUID) @@ -895,95 +896,77 @@ if newmsd.isBackup(): raise se.BackupCannotBeMasterDomain(msdUUID) - # Copy master file system content to the new master - src = os.path.join(curmsd.domaindir, sd.MASTER_FS_DIR) - dst = os.path.join(newmsd.domaindir, sd.MASTER_FS_DIR) + # If the new master domain is using safelease (version < 3) then + # we can speed up the cluster lock acquirement by resetting the + # SPM lease. + # XXX: With SANLock there is no need to speed up the process (the + # acquirement will take a short time anyway since we already hold + # the host id) and more importantly resetting the lease is going + # to interfere with the regular SANLock behavior. + # @deprecated this is relevant only for domain version < 3 + if not newmsd.hasVolumeLeases(): + newmsd.initSPMlease() - # Mount new master file system - newmsd.mountMaster() - # Make sure there is no cruft left over - for dir in [newmsd.getVMsDir(), newmsd.getTasksDir()]: - fileUtils.cleanupdir(dir) + # Forcing to acquire the host id (if it's not acquired already) + # and acquiring the cluster lock on new master. + newmsd.acquireHostId(self.id) + newmsd.acquireClusterLock(self.id) try: - fileUtils.tarCopy(src, dst, exclude=("./lost+found",)) - except fileUtils.TarCopyFailed: - self.log.error("tarCopy failed", exc_info=True) - # Failed to copy the master data + self.log.debug('migration to the new master %s begins', + newmsd.sdUUID) + + # Mount new master file system + newmsd.mountMaster() + + # Make sure there is no cruft left over + for dir in [newmsd.getVMsDir(), newmsd.getTasksDir()]: + fileUtils.cleanupdir(dir) + + # Copy master file system content to the new master + src = os.path.join(curmsd.domaindir, sd.MASTER_FS_DIR) + dst = os.path.join(newmsd.domaindir, sd.MASTER_FS_DIR) + fileUtils.tarCopy(src, dst, exclude=('./lost+found',)) + + if not newmsd.getMDPath(): + raise se.StorageDomainLayoutError("domain", msdUUID) + + newmsd.changeRole(sd.MASTER_DOMAIN) + self.switchMasterDomain(curmsd, newmsd, masterVersion) + except Exception: + self.log.exception('migration to new master failed') try: newmsd.unmountMaster() - except Exception: - self.log.error("Unexpected error", exc_info=True) - raise se.StorageDomainMasterCopyError(msdUUID) - - self.copyPoolMD(curmsd, newmsd) - - path = newmsd.getMDPath() - if not path: - newmsd.unmountMaster() - raise se.StorageDomainLayoutError("domain", msdUUID) - - # Acquire cluster lock on new master - try: - # If the new master domain is using safelease (version < 3) then - # we can speed up the cluster lock acquirement by resetting the - # SPM lease. - # XXX: With SANLock there is no need to speed up the process (the - # acquirement will take a short time anyway since we already hold - # the host id) and more importantly resetting the lease is going - # to interfere with the regular SANLock behavior. - # @deprecated this is relevant only for domain version < 3 - if not newmsd.hasVolumeLeases(): - newmsd.initSPMlease() - # Forcing to acquire the host id (if it's not acquired already) - newmsd.acquireHostId(self.id) - newmsd.acquireClusterLock(self.id) - except Exception: - self.log.error("Unexpected error", exc_info=True) + except: # logging only + self.log.error('unable to unmount master filesystem ' + 'for domain %s', newmsd.sdUUID) newmsd.releaseClusterLock() - newmsd.unmountMaster() - raise - self.log.debug("masterMigrate - lease acquired successfully") - - try: - # Now mark new domain as 'master' - # if things break down here move the master back pronto - newPoolMD = self._getPoolMD(newmsd) - with newPoolMD.transaction(): - newPoolMD[PMDK_MASTER_VER] = masterVersion - newmsd.changeRole(sd.MASTER_DOMAIN) - self._saveReconnectInformation(self.id, self.scsiKey, - newmsd.sdUUID, masterVersion) - except Exception: - self.log.error("Unexpected error", exc_info=True) - newmsd.releaseClusterLock() - newmsd.unmountMaster() raise # From this point on we have a new master and should not fail try: - # Now recreate 'mastersd' link - # we can use refresh() to do the job self.refresh(msdUUID, masterVersion) + self._saveReconnectInformation( + self.id, self.scsiKey, newmsd.sdUUID, masterVersion) # From this point on there is a new master domain in the pool - # Now that we are beyond the critical point we can clean up things - curmsd.changeRole(sd.REGULAR_DOMAIN) + # Now that we are beyond the critical point we can clean up + # things + self.setDomainRegularRole(curmsd) # Clean up the old data from previous master fs for directory in [curmsd.getVMsDir(), curmsd.getTasksDir()]: fileUtils.cleanupdir(directory) - - # NOTE: here we unmount the *previous* master file system !!! - curmsd.unmountMaster() except Exception: - self.log.error("Unexpected error", exc_info=True) - - try: - # Release old lease + self.log.exception('ignoring old master cleanup failure') + finally: + # Unmoung old master filesystem and release old cluster lock + try: + curmsd.unmountMaster() + except: # logging only + self.log.error('unable to unmount master filesystem ' + 'for domain %s', curmsd.sdUUID) curmsd.releaseClusterLock() - except Exception: - self.log.error("Unexpected error", exc_info=True) def attachSD(self, sdUUID): """ -- To view, visit http://gerrit.ovirt.org/22419 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I155b36d41df43230f99ba610699bba05bee3f0c0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

5 29

Change in vdsm[master]: sp: move validatePoolSD in the StoragePool class
by Federico Simoncelli 13 Jan '14

13 Jan '14

Federico Simoncelli has uploaded a new change for review. Change subject: sp: move validatePoolSD in the StoragePool class ...................................................................... sp: move validatePoolSD in the StoragePool class It's the StoragePool duty to validate if an operation cannot be accomplished because the storage domain is not part of the pool. Change-Id: I75f0245ec5449d57431df7055be401d73975312b Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/storage/hsm.py M vdsm/storage/sp.py 2 files changed, 16 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/21787/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 0836777..231ea72 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -665,7 +665,6 @@ size = math.ceil(size / 2 ** 20) pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) pool.extendVolume(sdUUID, volumeUUID, size, isShuttingDown) @public @@ -748,7 +747,6 @@ vars.task.getSharedLock(STORAGE, sdUUID) # We need to let the domain to extend itself pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) dmDevs = tuple(os.path.join(devicemapper.DMPATH_PREFIX, guid) for guid in guids) pool.extendSD(sdUUID, dmDevs, force) @@ -797,7 +795,6 @@ vars.task.getExclusiveLock(STORAGE, spUUID) vars.task.getExclusiveLock(STORAGE, sdUUID) pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) pool.detachSD(sdUUID) @public @@ -1188,7 +1185,6 @@ vars.task.getExclusiveLock(STORAGE, spUUID) vars.task.getExclusiveLock(STORAGE, sdUUID) pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) pool.deactivateSD(sdUUID, msdUUID, masterVersion) @public @@ -1252,7 +1248,6 @@ """ vars.task.getSharedLock(STORAGE, sdUUID) pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) pool.setVolumeDescription(sdUUID, imgUUID, volUUID, description) @public @@ -1276,7 +1271,6 @@ vars.task.getSharedLock(STORAGE, sdUUID) pool = self.getPool(spUUID) - pool.validatePoolSD(sdUUID) pool.setVolumeLegality(sdUUID, imgUUID, volUUID, legality) @public @@ -1301,9 +1295,7 @@ """ vars.task.getSharedLock(STORAGE, spUUID) pool = self.getPool(spUUID) - if sdUUID and sdUUID != sd.BLANK_UUID: - pool.validatePoolSD(sdUUID) - else: + if not sdUUID or sdUUID == sd.BLANK_UUID: sdUUID = pool.masterDomain.sdUUID vmUUIDs = [vmDesc['vm'] for vmDesc in vmList] @@ -1329,9 +1321,7 @@ """ vars.task.getSharedLock(STORAGE, spUUID) pool = self.getPool(spUUID) - if sdUUID and sdUUID != sd.BLANK_UUID: - pool.validatePoolSD(sdUUID) - else: + if not sdUUID or sdUUID == sd.BLANK_UUID: sdUUID = pool.masterDomain.sdUUID vars.task.getExclusiveLock(STORAGE, "%s_%s" % (vmUUID, sdUUID)) pool.removeVM(vmUUID=vmUUID, sdUUID=sdUUID) @@ -1351,9 +1341,7 @@ :param options: ? """ pool = self.getPool(spUUID) - if sdUUID and sdUUID != sd.BLANK_UUID: - pool.validatePoolSD(sdUUID) - else: + if not sdUUID or sdUUID != sd.BLANK_UUID: sdUUID = pool.masterDomain.sdUUID vars.task.getSharedLock(STORAGE, sdUUID) vms = pool.getVmsList(sdUUID) @@ -1379,7 +1367,6 @@ """ pool = self.getPool(spUUID) if sdUUID and sdUUID != sd.BLANK_UUID: - pool.validatePoolSD(sdUUID) # Only backup domains are allowed in this path self.validateBackupDom(sdUUID) else: @@ -2688,7 +2675,6 @@ vars.task.getSharedLock(STORAGE, sdUUID) pool = self.getPool(dom.getPools()[0]) - pool.validatePoolSD(sdUUID) pool.setSDDescription(dom, description) @public diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 37dcec8..11d8d00 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1062,6 +1062,7 @@ dom = sdCache.produce(sdUUID) # Avoid detach domains if not owned by pool + self.validatePoolSD(sdUUID) self.validateAttachedDomain(dom) if sdUUID == self.masterDomain.sdUUID: @@ -1148,6 +1149,7 @@ :param masterVersion: new master storage domain version """ + self.validatePoolSD(sdUUID) self.log.info("sdUUID=%s spUUID=%s newMsdUUID=%s", sdUUID, self.spUUID, newMsdUUID) domList = self.getDomains() @@ -1328,6 +1330,7 @@ If sdUUID is None, the update is on the pool, and therefore the master domain will be updated. """ + self.validatePoolSD(sdUUID) self.log.info("spUUID=%s sdUUID=%s", self.spUUID, sdUUID) vms = self._getVMsPath(sdUUID) # We should exclude 'masterd' link from IMG_METAPATTERN globing @@ -1365,6 +1368,7 @@ Remove VM. 'vmUUID' - Virtual machine UUID """ + self.validatePoolSD(sdUUID) self.log.info("spUUID=%s vmUUID=%s sdUUID=%s", self.spUUID, vmUUID, sdUUID) vms = self._getVMsPath(sdUUID) @@ -1392,6 +1396,7 @@ # block devices. The scope of this method is to extend only the # volume apparent size; the virtual disk size seen by the guest is # unchanged. + self.validatePoolSD(sdUUID) sdCache.produce(sdUUID).extendVolume(volumeUUID, size, isShuttingDown) def extendVolumeSize(self, sdUUID, imgUUID, volUUID, newSize): @@ -1972,6 +1977,7 @@ self.masterDomain.detach(self.spUUID) def setVolumeDescription(self, sdUUID, imgUUID, volUUID, description): + self.validatePoolSD(sdUUID) imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE) with rmanager.acquireResource(imageResourcesNamespace, imgUUID, rm.LockType.exclusive): @@ -1980,6 +1986,7 @@ volUUID=volUUID).setDescription(descr=description) def setVolumeLegality(self, sdUUID, imgUUID, volUUID, legality): + self.validatePoolSD(sdUUID) imageResourcesNamespace = sd.getNamespace(sdUUID, IMAGE_NAMESPACE) with rmanager.acquireResource(imageResourcesNamespace, imgUUID, rm.LockType.exclusive): @@ -1987,24 +1994,23 @@ imgUUID=imgUUID, volUUID=volUUID).setLegality(legality=legality) - def getVmsList(self, sdUUID=None): - if sdUUID is None: - dom = self.masterDomain - else: - dom = sdCache.produce(sdUUID) - - return dom.getVMsList() + def getVmsList(self, sdUUID): + self.validatePoolSD(sdUUID) + return sdCache.produce(sdUUID).getVMsList() def getVmsInfo(self, sdUUID, vmList=None): + self.validatePoolSD(sdUUID) return sdCache.produce(sdUUID).getVMsInfo(vmList=vmList) def validateVolumeChain(self, sdUUID, imgUUID): image.Image(self.poolPath).validateVolumeChain(sdUUID, imgUUID) def extendSD(self, sdUUID, devlist, force): + self.validatePoolSD(sdUUID) sdCache.produce(sdUUID).extend(devlist, force) def setSDDescription(self, sd, description): + self.validatePoolSD(sd.sdUUID) sd.setDescription(descr=description) def getAllTasksStatuses(self): -- To view, visit http://gerrit.ovirt.org/21787 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75f0245ec5449d57431df7055be401d73975312b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

5 19

← Newer
1
...
21
22
23
24
25
26
27
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2013