vdsm-patches December 2014

vdsm-patches@lists.fedorahosted.org

42 participants
734 discussions

Change in vdsm[master]: vm: per-attribute monitor response check
by fromani＠redhat.com 21 Apr '15

21 Apr '15

Francesco Romani has uploaded a new change for review. Change subject: vm: per-attribute monitor response check ...................................................................... vm: per-attribute monitor response check the responsiveness of the monitor is reported through a single instance variable, which is updated after each libvirt call. If one single call goes in timeout, while the others go well, due to interplay between timeouts and polling interval, it can happen that reported status bounces back and forth between 'Up' and 'Not Responding'. This patch address this behaviour by keeping track of the timeouts per-dom-attribute instead of per-dom, and reports the monitor as not respondig if, and until, at least one had a timeout in the last call. Change-Id: I32a98d34cde91fa9dc3d07f03c47a5f2f22da620 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/vm.py 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/23138/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 55683f4..9d7ca03 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -853,11 +853,11 @@ def f(*args, **kwargs): try: ret = attr(*args, **kwargs) - self._cb(False) + self._cb(False, name) return ret except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_TIMEOUT: - self._cb(True) + self._cb(True, name) toe = TimeoutError(e.get_error_message()) toe.err = e.err raise toe @@ -1938,6 +1938,9 @@ if (self.arch not in ['ppc64', 'x86_64']): raise RuntimeError('Unsupported architecture: %s' % self.arch) + + self._attrTimeoutLock = threading.Lock() + self._attrTimeoutExperienced = {} # will keep track of timeout data def _get_lastStatus(self): PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -3631,11 +3634,13 @@ def _monitorDependentInit(self, timeout=None): self.log.warning('unsupported by libvirt vm') - def _timeoutExperienced(self, timeout): - if timeout: - self._monitorResponse = -1 - else: - self._monitorResponse = 0 + def _timeoutExperienced(self, timeout, attrName): + with self._attrTimeoutLock: + self._attrTimeoutExperienced[attrName] = timeout + if any(self._attrTimeoutExperienced.itervalues()): + self._monitorResponse = -1 + else: + self._monitorResponse = 0 def _waitForIncomingMigrationFinish(self): if 'restoreState' in self.conf: -- To view, visit http://gerrit.ovirt.org/23138 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32a98d34cde91fa9dc3d07f03c47a5f2f22da620 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

8 52

Change in vdsm[master]: stomp: Remove redundant code
by smizrahi＠redhat.com 18 Apr '15

18 Apr '15

Saggi Mizrahi has uploaded a new change for review. Change subject: stomp: Remove redundant code ...................................................................... stomp: Remove redundant code Change-Id: I7b9fb4b4b4c5286733f8f4435ec6dcea04f96233 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M lib/yajsonrpc/stomp.py 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/35939/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index d99ed98..279aa24 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -253,15 +253,12 @@ if buf[cl] != "\0": raise RuntimeError("Frame end is missing \\0") - remainingBytes = 0 self._flush() - body = buf - self._write_buffer(body[cl + 1:]) - body = body[:cl] + self._write_buffer(buf[cl + 1:]) + body = buf[:cl] - if remainingBytes == 0: - self._tmpFrame.body = body - self._pushFrame() + self._tmpFrame.body = body + self._pushFrame() return True -- To view, visit http://gerrit.ovirt.org/35939 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b9fb4b4b4c5286733f8f4435ec6dcea04f96233 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

9 56

Change in vdsm[master]: stomp: Make sure the \0 is read before slicing the buffer
by smizrahi＠redhat.com 18 Apr '15

18 Apr '15

Saggi Mizrahi has uploaded a new change for review. Change subject: stomp: Make sure the \0 is read before slicing the buffer ...................................................................... stomp: Make sure the \0 is read before slicing the buffer In python if you try and slice past the end of the list\string you get an empty string and not an IndexError The original code check that we got all the data and sliced past the ending \0. But on rare cases where the message ended exactly with all the content but the \0 was not received. The slicing code would silently ignore the fact that the index doesn't exist and would return an empty string and switch the parser state making all future data have the wrong offset. This in turn made the command '\0SEND' instead of 'SEND' which has no handler and where silently ignored. The only way to solve this was to reconnect. Bug-Url: http://bugzilla.redhat.com/1169100 Change-Id: Ie0d8eaae161f3ec6c77726f4f9da044ab7c629d4 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M lib/yajsonrpc/stomp.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/35938/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 04c23ba..d99ed98 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -247,9 +247,12 @@ buf = self._get_buffer() cl = self._contentLength ndata = len(buf) - if ndata < cl: + if ndata < (cl + 1): return False + if buf[cl] != "\0": + raise RuntimeError("Frame end is missing \\0") + remainingBytes = 0 self._flush() body = buf -- To view, visit http://gerrit.ovirt.org/35938 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0d8eaae161f3ec6c77726f4f9da044ab7c629d4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

9 66

Change in vdsm[master]: jsonrpc: Optimize stomp encoder\decoder
by smizrahi＠redhat.com 18 Apr '15

18 Apr '15

Saggi Mizrahi has uploaded a new change for review. Change subject: jsonrpc: Optimize stomp encoder\decoder ...................................................................... jsonrpc: Optimize stomp encoder\decoder Change-Id: I341e46463e654ae0a086cd49af18aa336b86cb6e Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M lib/yajsonrpc/stomp.py 1 file changed, 60 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/35255/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 884bff6..1dda6d7 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -14,8 +14,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import logging +import os import socket -import cStringIO from threading import Timer, Event from uuid import uuid4 from collections import deque @@ -27,6 +27,8 @@ _RE_ESCAPE_SEQUENCE = re.compile(r"\\(.)") +_RE_ENCODE_CHARS = re.compile(r"[\r\n\\:]") + _EC_DECODE_MAP = { r"\\": "\\", r"r": "\r", @@ -34,7 +36,12 @@ r"c": ":", } -_ESCAPE_CHARS = (('\\\\', '\\'), ('\\r', '\r'), ('\\n', '\n'), ('\\c', ':')) +_EC_ENCODE_MAP = { + ":": "\c", + "\\": "\\\\", + "\r": "\\r", + "\n": "\\n", +} class Command: @@ -70,6 +77,8 @@ class Frame(object): + __slots__ = ("headers", "command", "body") + def __init__(self, command="", headers=None, body=None): self.command = command if headers is None: @@ -87,15 +96,19 @@ if body is not None: self.headers["content-length"] = len(body) - data = self.command + '\n' - data += '\n'.join(["%s:%s" % (encodeValue(key), encodeValue(value)) - for key, value in self.headers.iteritems()]) - data += '\n\n' - if body is not None: - data += body + data = [self.command, '\n'] + for key, value in self.headers.iteritems(): + data.append(encodeValue(key)) + data.append(":") + data.append(encodeValue(value)) + data.append("\n") - data += "\0" - return data + data.append('\n') + if body is not None: + data.append(body) + + data.append("\0") + return ''.join(data) def __repr__(self): return "<StompFrame command=%s>" % (repr(self.command)) @@ -111,24 +124,23 @@ raise ValueError("Contains illigal charachter `:`") try: - return _RE_ESCAPE_SEQUENCE.sub( - lambda m: _EC_DECODE_MAP[m.groups()[0]], - s + s = _RE_ESCAPE_SEQUENCE.sub( + lambda m: _EC_DECODE_MAP[m.group(0)], + s, ) except KeyError as e: raise ValueError("Containes invalid escape squence `\\%s`" % e.args[0]) + return s.decode('utf-8') + def encodeValue(s): - if not isinstance(s, (str, unicode)): - s = str(s) - for escaped, raw in _ESCAPE_CHARS: - s = s.replace(raw, escaped) - if isinstance(s, unicode): s = s.encode('utf-8') + elif not isinstance(s, str): + s = str(s) - return s + return _RE_ENCODE_CHARS.sub(lambda m: _EC_ENCODE_MAP[m.group(0)], s) class Parser(object): @@ -142,22 +154,29 @@ self._STATE_HEADER: self._parse_header, self._STATE_BODY: self._parse_body} self._frames = deque() - self._state = self._STATE_CMD + self._change_state(self._STATE_CMD) self._contentLength = -1 self._flush() + def _change_state(self, new_state): + self._state = new_state + self._state_cb = self._states[new_state] + def _flush(self): - self._buffer = cStringIO.StringIO() + self._buffer = "" + + def _write_buffer(self, buff): + self._buffer += buff + + def _get_buffer(self): + return self._buffer def _handle_terminator(self, term): - if term not in self._buffer.getvalue(): + res, _, rest = self._buffer.partition(term) + if not _: return None - data = self._buffer.getvalue() - res, rest = data.split(term, 1) - self._flush() - self._buffer.write(rest) - + self._buffer = rest return res def _parse_command(self): @@ -174,7 +193,7 @@ cmd = decodeValue(cmd) self._tmpFrame = Frame(cmd) - self._state = self._STATE_HEADER + self._change_state(self._STATE_HEADER) return True def _parse_header(self): @@ -182,13 +201,13 @@ if header is None: return False - headers = self._tmpFrame.headers if len(header) > 0 and header[-1] == '\r': header = header[:-1] + headers = self._tmpFrame.headers if header == "": self._contentLength = int(headers.get('content-length', -1)) - self._state = self._STATE_BODY + self._change_state(self._STATE_BODY) return True key, value = header.split(":", 1) @@ -206,7 +225,7 @@ def _pushFrame(self): self._frames.append(self._tmpFrame) - self._state = self._STATE_CMD + self._change_state(self._STATE_CMD) self._tmpFrame = None self._contentLength = -1 @@ -226,16 +245,16 @@ return True def _parse_body_length(self): - buf = self._buffer + buf = self._get_buffer() cl = self._contentLength - ndata = buf.tell() + ndata = len(buf) if ndata < cl: return False remainingBytes = 0 self._flush() - body = buf.getvalue() - self._buffer.write(body[cl + 1:]) + body = buf + self._write_buffer(body[cl + 1:]) body = body[:cl] if remainingBytes == 0: @@ -249,9 +268,8 @@ return len(self._frames) def parse(self, data): - states = self._states - self._buffer.write(data) - while states[self._state](): + self._write_buffer(data) + while self._state_cb(): pass def popFrame(self): @@ -347,7 +365,7 @@ def put_subscribe(self, destination, ack=None): subid = self._aclient.subscribe(self._adisp, destination, ack) - sub = Subsciption(self, subid, ack) + sub = Subscription(self, subid, ack) self._registerSubscription(sub) return sub @@ -378,7 +396,7 @@ class AsyncDispatcher(object): log = logging.getLogger("stomp.AsyncDispatcher") - def __init__(self, frameHandler, bufferSize=1024): + def __init__(self, frameHandler, bufferSize=4096): self._frameHandler = frameHandler self._bufferSize = bufferSize self._parser = Parser() @@ -471,7 +489,7 @@ return True def _milis(self): - return int(round(time.time() * 1000)) + return int(os.times()[4] * 1000) class AsyncClient(object): @@ -552,7 +570,7 @@ return subscriptionID -class Subsciption(object): +class Subscription(object): def __init__(self, client, subid, ack): self._ack = ack self._subid = subid -- To view, visit http://gerrit.ovirt.org/35255 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I341e46463e654ae0a086cd49af18aa336b86cb6e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

8 75

Change in vdsm[master]: vm: hyperv: hyperv enlightenment optimizations
by fromani＠redhat.com 15 Apr '15

15 Apr '15

Francesco Romani has uploaded a new change for review. Change subject: vm: hyperv: hyperv enlightenment optimizations ...................................................................... vm: hyperv: hyperv enlightenment optimizations This patch the hyperv enlightenment optimizations. The optimizations are both for stability and for performance, and they are added on top of the HyperV support. The parameters are hardcoded and not externally configurable because they are not supposed to be changed very often, if changed at all; moreover, this patch already implements the optimal recommended settings. Change-Id: Ia10cb4ce254b6e6f560c045aff9e68846fe4771f Bug-Url: https://bugzilla.redhat.com/1083529 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/vmTests.py M vdsm/virt/vm.py 2 files changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/29234/1 diff --git a/tests/vmTests.py b/tests/vmTests.py index 7ee2eb8..9317887 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -327,6 +327,8 @@ <acpi/> <hyperv> <relaxed state="on"/> + <vapic state="on"/> + <spinlocks retries="8191" state="on"/> </hyperv> </features>""" conf = {'hypervEnable': 'true'} @@ -382,7 +384,7 @@ def testHyperVClockXML(self): clockXML = """ <clock adjustment="-3600" offset="variable"> - <timer name="rtc" tickpolicy="catchup" track="guest"/> + <timer name="hypervclock" tickpolicy="catchup"/> <timer name="pit" tickpolicy="delay"/> <timer name="hpet" present="no"/> </clock>""" diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index ec8ca12..4f3c531 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -717,13 +717,20 @@ <clock offset="variable" adjustment="-3600"> <timer name="rtc" tickpolicy="catchup"> </clock> + + for hyperv: + <clock offset="variable" adjustment="-3600"> + <timer name="hypervclock" tickpolicy="catchup"> + </clock> """ + + clockName = 'hypervclock' if self._isHyperV() else 'rtc' + # 'hypervclock' does not support the 'track' attribute. + # libvirt docs is not very clear here. m = XMLElement('clock', offset='variable', adjustment=str(self.conf.get('timeOffset', 0))) - rtc = m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup') - if utils.tobool(self.conf.get('hypervEnable', 'false')): - rtc.setAttrs(track='guest') + m.appendChildWithArgs('timer', name=clockName, tickpolicy='catchup') m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') if self.arch == caps.Architecture.X86_64: @@ -841,6 +848,11 @@ hyperv.appendChildWithArgs('relaxed', state='on') # turns off an internal Windows watchdog, and by doing so avoids # some high load BSODs. + hyperv.appendChildWithArgs('vapic', state='on') + hyperv.appendChildWithArgs( + 'spinlocks', state='on', retries='8191') + # performance optimization flags, that can improve the performance + # by 10% to much more (in extreme cases of resources overcommit). def appendCpu(self): """ -- To view, visit http://gerrit.ovirt.org/29234 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia10cb4ce254b6e6f560c045aff9e68846fe4771f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

7 115

Change in vdsm[master]: vm: remove guest agent channels tunables
by fromani＠redhat.com 09 Apr '15

09 Apr '15

Francesco Romani has uploaded a new change for review. Change subject: vm: remove guest agent channels tunables ...................................................................... vm: remove guest agent channels tunables We had tunables to disable vm/ga channels creation from a long time, but it was just on debug purposes and these settings should never be used in production. Moreover, we acttually rely on the channel being here (see RHBZ#1126887). Since it is now possible the achive the same results through hooks, is time to drop these tunables. Change-Id: I4774441d7bd6dcdbb58e38886eb522851d4af37c Relates-To: https://bugzilla.redhat.com/1126887 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M client/vdsClient.py M tests/vmTestsData.py M vdsm/virt/vm.py 3 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/31245/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 2c09b28..ca82519 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1869,7 +1869,6 @@ # 'want to reserve with the machine' 'o acpiEnable : If present will remove the default ' '-no-acpi switch', - 'o qgaEnable : use qemu-ga as guest agent', 'o spiceSecureChannels : comma-separated list of ' 'spice channel that will be encrypted', 'o spiceMonitors : number of emulated screen heads', diff --git a/tests/vmTestsData.py b/tests/vmTestsData.py index 02959fd..0990641 100644 --- a/tests/vmTestsData.py +++ b/tests/vmTestsData.py @@ -27,7 +27,6 @@ 'acpiEnable': 'true', 'cpuType': 'qemu64', 'smpCoresPerSocket': 1, 'smpThreadsPerCore': 1, 'smp': '1', 'cpuPinning': {}, 'numaTune': {}, 'maxVCpus': '160', - 'vmchannel': 'true', 'qgaEnable': 'true', 'tabletEnable': False, 'displayNetwork': 'mydisp', 'custom': {}, 'guestNumaNodes': []}, @@ -95,7 +94,6 @@ 'acpiEnable': 'true', 'cpuType': 'qemu64', 'smpCoresPerSocket': 1, 'smpThreadsPerCore': 1, 'smp': '1', 'cpuPinning': {}, 'numaTune': {}, 'maxVCpus': '160', - 'vmchannel': 'true', 'qgaEnable': 'true', 'tabletEnable': False, 'displayNetwork': 'mydisp', 'custom': {}, 'guestNumaNodes': []}, diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 591616d..714b718 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2689,17 +2689,10 @@ domxml.appendNumaTune() - if utils.tobool(self.conf.get('vmchannel', 'true')): - domxml._appendAgentDevice(self._guestSocketFile.decode('utf-8'), - _VMCHANNEL_DEVICE_NAME) - else: - self.log.warning('detected disabled vmchannel.' - ' This should be done ONLY for debug purposes' - ' and never in production environments') - if utils.tobool(self.conf.get('qgaEnable', 'true')): - domxml._appendAgentDevice( - self._qemuguestSocketFile.decode('utf-8'), - _QEMU_GA_DEVICE_NAME) + domxml._appendAgentDevice(self._guestSocketFile.decode('utf-8'), + _VMCHANNEL_DEVICE_NAME) + domxml._appendAgentDevice(self._qemuguestSocketFile.decode('utf-8'), + _QEMU_GA_DEVICE_NAME) domxml.appendInput() if self.arch == caps.Architecture.PPC64: @@ -2841,8 +2834,7 @@ # So, run it after you have this info self._initVmStats() self.guestAgent = guestagent.GuestAgent( - self._guestSocketFile, self.cif.channelListener, self.log, - connect=utils.tobool(self.conf.get('vmchannel', 'true'))) + self._guestSocketFile, self.cif.channelListener, self.log) self._guestCpuRunning = self._isDomainRunning() if self.lastStatus not in (vmstatus.MIGRATION_DESTINATION, @@ -4010,9 +4002,7 @@ snap.appendChild(_memorySnapshot(memoryVolPath)) else: snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY - - if utils.tobool(self.conf.get('qgaEnable', 'true')): - snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE + snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE snapxml = snap.toprettyxml() self.log.debug(snapxml) -- To view, visit http://gerrit.ovirt.org/31245 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4774441d7bd6dcdbb58e38886eb522851d4af37c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 23

Change in vdsm[master]: client: Add warning prompt on dangerous commands
by dkuznets＠redhat.com 09 Apr '15

09 Apr '15

Dima Kuznetsov has uploaded a new change for review. Change subject: client: Add warning prompt on dangerous commands ...................................................................... client: Add warning prompt on dangerous commands Added a warning and confirmation prompt for the following commands: * deactivateStorageDomain * deleteImage * deleteVolume * deleteVolumeByDescr * destroyStoragePool * extendStorageDomain * extendVolume * forcedDetachStorageDomain * formatStorageDomain * mergeSnapshots * moveImage * moveMultiImage * reconstructMaster * releaseDomainLock * removeVG Also added '--force' flag to bypass warnings and prompts (intended for scripts). Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1005923 Change-Id: Idea34ad7c3d5b66993bcb56b61e7edb0549ef9fb Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> --- M client/vdsClient.py M lib/vdsm/vdscli.py.in M tests/vdsClientTests.py 3 files changed, 95 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/28174/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 0235837..0eb4aac 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -85,6 +85,7 @@ print "-m\tList supported methods and their params (Short help)" print "-s [--truststore path]\tConnect to server with SSL." print "-o, --oneliner\tShow the key-val information in one line." + print "--force\tDo not prompt on dangerous commands (not recommended)." print "\tIf truststore path is not specified, use defaults." print "\nCommands" verbs = cmd.keys() @@ -2070,11 +2071,12 @@ 'Create a new VG from devices devlist (list of dev ' 'GUIDs)' )), - 'removeVG': (serv.removeVG, + 'removeVG': (vdscli.request_confirmation(serv.removeVG), ('<vgUUID>', 'remove the VG identified by its UUID' )), - 'extendStorageDomain': (serv.extendStorageDomain, + 'extendStorageDomain': (vdscli.request_confirmation( + serv.extendStorageDomain), ('<sdUUID> <spUUID> <devlist>', 'Extend the Storage Domain by adding devices' ' devlist (list of dev GUIDs)' @@ -2132,7 +2134,8 @@ ('<spUUID> <sdUUID>', 'acquire storage domain lock' )), - 'releaseDomainLock': (serv.releaseDomainLock, + 'releaseDomainLock': (vdscli.request_confirmation( + serv.releaseDomainLock), ('<spUUID> <sdUUID>', 'release storage domain lock' )), @@ -2154,7 +2157,8 @@ ('<spUUID> <vmUUID> [sdUUID]', 'Remove VM from pool or Backup domain' )), - 'reconstructMaster': (serv.reconstructMaster, + 'reconstructMaster': (vdscli.request_confirmation( + serv.reconstructMaster), ('<spUUID> <poolName> <masterDom> ' '<domDict>({sdUUID1=status,sdUUID2=status,...})' ' <masterVersion>, [<lockPolicy> ' @@ -2171,7 +2175,8 @@ 'Create new storage pool with single/multiple ' 'image data domain' )), - 'destroyStoragePool': (serv.destroyStoragePool, + 'destroyStoragePool': (vdscli.request_confirmation( + serv.destroyStoragePool), ('<spUUID> <id> <scsi-key>', 'Destroy storage pool', 'Parameter scsi-key is ignored (maintained ' @@ -2227,7 +2232,8 @@ 'Activate a storage domain that is already ' 'a member in a storage pool.' )), - 'deactivateStorageDomain': (serv.deactivateStorageDomain, + 'deactivateStorageDomain': (vdscli.request_confirmation( + serv.deactivateStorageDomain), ('<domain UUID> <pool UUID> <new master ' 'domain UUID> <masterVer>', 'Deactivate a storage domain. ' @@ -2241,12 +2247,14 @@ ' UUID> <masterVer>', 'Detach a storage domain from a storage pool.' )), - 'forcedDetachStorageDomain': (serv.forcedDetachStorageDomain, + 'forcedDetachStorageDomain': (vdscli.request_confirmation( + serv.forcedDetachStorageDomain), ('<domain UUID> <pool UUID>', 'Forced detach a storage domain from a ' 'storage pool.' )), - 'formatStorageDomain': (serv.formatStorageDomain, + 'formatStorageDomain': (vdscli.request_confirmation( + serv.formatStorageDomain), ('<domain UUID> [<autoDetach>]', 'Format detached storage domain.' )), @@ -2269,7 +2277,8 @@ '<srcImgUUID> <srcVolUUID>', 'Creates new volume or snapshot' )), - 'extendVolumeSize': (serv.extendVolumeSize, ( + 'extendVolumeSize': (vdscli.request_confirmation( + serv.extendVolumeSize), ( '<spUUID> <sdUUID> <imgUUID> <volUUID> <newSize>', 'Extend the volume size (virtual disk size seen by the guest).', )), @@ -2287,12 +2296,13 @@ '<Legality>', 'Set volume legality (ILLEGAL/LEGAL).' )), - 'deleteVolume': (serv.deleteVolume, + 'deleteVolume': (vdscli.request_confirmation(serv.deleteVolume), ('<sdUUID> <spUUID> <imgUUID> <volUUID>,...,<volUUID>' ' <postZero> [<force>]', 'Deletes an volume if its a leaf. Else returns error' )), - 'deleteVolumeByDescr': (serv.deleteVolumeByDescr, + 'deleteVolumeByDescr': (vdscli.request_confirmation( + serv.deleteVolumeByDescr), ('<part of description> <sdUUID> <spUUID> ' '<imgUUID>', 'Deletes list of volumes(only leafs) ' @@ -2391,11 +2401,11 @@ ' <enabled = true/false>', 'Enable or disable Hosted Engine HA' ' maintenance')), - 'deleteImage': (serv.deleteImage, + 'deleteImage': (vdscli.request_confirmation(serv.deleteImage), ('<sdUUID> <spUUID> <imgUUID> [<postZero>] [<force>]', 'Delete Image folder with all volumes.', )), - 'moveImage': (serv.moveImage, + 'moveImage': (vdscli.request_confirmation(serv.moveImage), ('<spUUID> <srcDomUUID> <dstDomUUID> <imgUUID> <vmUUID>' ' <op = COPY_OP/MOVE_OP> [<postZero>] [ <force>]', 'Move/Copy image between storage domains within same ' @@ -2423,7 +2433,7 @@ 'Download an image from a remote endpoint using the specified', 'methodArgs.' )), - 'moveMultiImage': (serv.moveMultiImage, + 'moveMultiImage': (vdscli.request_confirmation(serv.moveMultiImage), ('<spUUID> <srcDomUUID> <dstDomUUID> ' '<imgList>({imgUUID=postzero,' 'imgUUID=postzero,...}) <vmUUID> [<force>]', @@ -2439,7 +2449,7 @@ 'Do it by collapse and copy the whole chain ' '(baseVolUUID->srcVolUUID)' )), - 'mergeSnapshots': (serv.mergeSnapshots, + 'mergeSnapshots': (vdscli.request_confirmation(serv.mergeSnapshots), ('<sdUUID> <spUUID> <vmUUID> <imgUUID> <Ancestor ' 'Image uuid> <Successor Image uuid> [<postZero>]', 'Merge images from successor to ancestor.', @@ -2574,8 +2584,8 @@ try: opts, args = getopt.getopt(sys.argv[1:], "hmso", ["help", "methods", "SSL", "truststore=", - "oneliner"]) - + "oneliner", "force"]) + vdscli.REQUEST_CONFIRMATION = True for o, v in opts: if o == "-h" or o == "--help": usage(commands) @@ -2589,6 +2599,8 @@ serv.truststore = v if o == '-o' or o == '--oneliner': serv.pretty = False + if o == '--force': + vdscli.REQUEST_CONFIRMATION = False if len(args) < 2: raise Exception("Need at least two arguments") server, command = args[0:2] diff --git a/lib/vdsm/vdscli.py.in b/lib/vdsm/vdscli.py.in index 5fa7528..2ac21b2 100644 --- a/lib/vdsm/vdscli.py.in +++ b/lib/vdsm/vdscli.py.in @@ -21,6 +21,7 @@ import xmlrpclib import subprocess +import functools import os import re import sys @@ -165,3 +166,25 @@ d_useSSL, d_tsPath) server = connect() print server.getVdsCapabilities() + + +USER_WARNING = """ +Please note that vdsClient is not a supported tool and should be used only with +direct guidance from support representative. + +This operation might cause data corruption, would you like to proceed? +[n][Y] """.lstrip() + + +REQUEST_CONFIRMATION = False + + +def request_confirmation(f): + @functools.wraps(f) + def wrapper(*args, **kwargs): + if REQUEST_CONFIRMATION: + resp = raw_input(USER_WARNING).decode('string_escape') + if resp != 'Y': + sys.exit(1) + return f(*args, **kwargs) + return wrapper diff --git a/tests/vdsClientTests.py b/tests/vdsClientTests.py index 41e93fc..8d9b943 100644 --- a/tests/vdsClientTests.py +++ b/tests/vdsClientTests.py @@ -22,12 +22,15 @@ from tempfile import mkstemp from contextlib import contextmanager import subprocess +import sys +import StringIO from testrunner import VdsmTestCase as TestCaseBase from monkeypatch import MonkeyPatch import vdsClient from vdsm.vdscli import __getLocalVdsName as getLocalVdsName +import vdsm.vdscli as vdscli @contextmanager @@ -150,6 +153,7 @@ class vdscliTests(TestCaseBase): + @MonkeyPatch(subprocess, 'Popen', lambda *y, **x: _FakePopen( 'subject= /O=VDSM Certificate/CN=myhost\n')) def test__getLocalVdsName1(self): @@ -166,3 +170,42 @@ def test__getLocalVdsName3(self): cn = getLocalVdsName('fake') self.assertEquals('0', cn) + + +class ConfirmationTests(TestCaseBase): + def testDefaultOff(self): + @vdscli.request_confirmation + def foobar(): + return 101 + + self.assertEquals(foobar(), 101) + + @MonkeyPatch(vdscli, 'REQUEST_CONFIRMATION', True) + @MonkeyPatch(sys, 'stdin', StringIO.StringIO('n\n')) + def testDenied(self): + lst = [] + + @vdscli.request_confirmation + def appent_to_lst(): + lst.append(1) + + try: + appent_to_lst() + except SystemExit: + pass + self.assertEquals(lst, []) + + @MonkeyPatch(vdscli, 'REQUEST_CONFIRMATION', True) + @MonkeyPatch(sys, 'stdin', StringIO.StringIO('Y\n')) + def testConfirmed(self): + lst = [] + + @vdscli.request_confirmation + def appent_to_lst(): + lst.append(1) + + try: + appent_to_lst() + except SystemExit: + pass + self.assertEquals(lst, [1]) -- To view, visit http://gerrit.ovirt.org/28174 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idea34ad7c3d5b66993bcb56b61e7edb0549ef9fb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuznets(a)redhat.com>

8 12

Change in vdsm[master]: spice: support to agent file transfer disable
by fromani＠redhat.com 01 Apr '15

01 Apr '15

Francesco Romani has uploaded a new change for review. Change subject: spice: support to agent file transfer disable ...................................................................... spice: support to agent file transfer disable Spice has agent based file transfer support. This option can be disabled in QEMU, and libvirt has support to pass this flag to the underlying QEMU. This patch expose this capability in VDSM, in the VM definition, implementing the VDSM part of bz983019. The new parameter is optional and enabled by default for backward compatibility. No XML changes are produced at all unless the new parameter is specified. Change-Id: Icc98a346baca4ab163ff30e891ae80535e49caa4 Bug-Url: https://bugzilla.redhat.com/983019 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M debian/control M tests/vmTests.py M vdsm.spec.in M vdsm/virt/vm.py M vdsm_api/vdsmapi-schema.json 5 files changed, 40 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/26917/1 diff --git a/debian/control b/debian/control index 45c2b1c..ddbaab3 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ python-cpopen (>= 1.3), python-dmidecode, python-ethtool (>=0.8), - python-libvirt (>= 1.0.2), + python-libvirt (>= 1.2.2), python-m2crypto, python-netaddr, python-nose, @@ -81,8 +81,8 @@ libnl1, libsanlock-client1 (>= 2.4), libsanlock-dev (>= 2.4), - libvirt-bin (>= 1.0.2), - libvirt0 (>= 1.0.2), + libvirt-bin (>= 1.2.2), + libvirt0 (>= 1.2.2), linux-image-generic (>= 3.6), logrotate, lvm2 (>= 2.02.95), @@ -98,7 +98,7 @@ python-dmidecode, python-ethtool (>= 0.8), python-ethtool (>= 0.8), - python-libvirt (>= 1.0.2), + python-libvirt (>= 1.2.2), python-m2crypto, python-netaddr, python-parted, @@ -294,7 +294,7 @@ Package: vdsm-hook-sriov Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version}), libvirt-bin (>= 1.0.2-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version}), libvirt-bin (>= 1.2.2-1) Description: sr-iov support for VDSM sr-iov hook enable to add virtual functions exposed by the device directly to a virtual machine. diff --git a/tests/vmTests.py b/tests/vmTests.py index 91ee466..11695b3 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -421,6 +421,20 @@ passwdValidTo="1970-01-01T00:00:01" port="-1" tlsPort="-1" type="spice"> <channel mode="secure" name="main"/> + </graphics>""", + + """ + <graphics autoport="yes" listen="0" passwd="*****" + passwdValidTo="1970-01-01T00:00:01" port="-1" + tlsPort="-1" type="spice"> + <filetransfer enable="no"/> + </graphics>""", + + """ + <graphics autoport="yes" listen="0" passwd="*****" + passwdValidTo="1970-01-01T00:00:01" port="-1" + tlsPort="-1" type="spice"> + <channel mode="secure" name="main"/> </graphics>"""] vmConfs = [ @@ -432,6 +446,16 @@ {'type': 'graphics', 'device': 'spice', 'specParams': { 'port': '-1', 'tlsPort': '-1', + 'spiceSecureChannels': 'smain'}}, + + {'type': 'graphics', 'device': 'spice', + 'specParams': { + 'port': '-1', 'tlsPort': '-1', + 'fileTransferEnable': 'false'}}, + + {'type': 'graphics', 'device': 'spice', + 'specParams': { + 'port': '-1', 'tlsPort': '-1', 'spiceSecureChannels': 'smain'}}] self._verifyGraphicsXML(expectedXMLs, vmConfs, False) diff --git a/vdsm.spec.in b/vdsm.spec.in index fd47bf6..af339e2 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -131,7 +131,7 @@ %endif %if 0%{?rhel} >= 7 || 0%{?fedora} >= 18 -Requires: libvirt-daemon >= 1.0.2-1 +Requires: libvirt-daemon >= 1.2.2-1 Requires: libvirt-daemon-config-nwfilter Requires: libvirt-daemon-driver-network Requires: libvirt-daemon-driver-nwfilter @@ -140,7 +140,7 @@ %if 0%{?rhel} Requires: libvirt >= 0.10.2-29.el6_5.4 %else -Requires: libvirt >= 1.0.2-1 +Requires: libvirt >= 1.2.2-1 %endif %endif Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index d68c292..27c2aab 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1415,6 +1415,10 @@ clipboard = XMLElement('clipboard', copypaste='no') graphics.appendChild(clipboard) + if not utils.tobool(self.specParams.get('fileTransferEnable', True)): + filetransfer = XMLElement('filetransfer', enable='no') + graphics.appendChild(filetransfer) + # handle deprecated channel name in a smart way, # not just chop 1st char! if graphicsAttrs['type'] == 'spice': diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 0300a27..0a8c506 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2523,12 +2523,16 @@ # @copyPasteEnable: #optional Specify if copy and paste is enabled. # Currently relevant for @spice devices only. # +# @fileTransferEnable: #optional Specify if file transfer is enabled. +# Currently relevant for @qxl devices only. +# # Since: 4.15.0 ## {'type': 'VmGraphicsDeviceSpecParams', 'data': {'port': 'uint', '*tlsPort': 'uint', '*keyMap': 'str', '*disableTicketing': 'bool', '*displayNetwork': 'str', - '*spiceSecureChannels': 'str', '*copyPasteEnable': 'bool'}} + '*spiceSecureChannels': 'str', '*copyPasteEnable': 'bool', + '*fileTransferEnable': 'bool'}} ## # @VmGraphicsDevice: -- To view, visit http://gerrit.ovirt.org/26917 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc98a346baca4ab163ff30e891ae80535e49caa4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 107

Change in vdsm[master]: vm: make new timekeeping revertable
by fromani＠redhat.com 30 Mar '15

30 Mar '15

Francesco Romani has uploaded a new change for review. Change subject: vm: make new timekeeping revertable ...................................................................... vm: make new timekeeping revertable The commit Icb0752e54a4cb9ff609b8ddfaf5c8fe2ed5b9e72 implemented the new timekeeping options recommended by QEMU developers. In order to maximize the backward compatibility and to deal with possible regression with old guests, this patch makes the new timekeeping settings revertable by exposing a new configuration variable. The default is enabled because those settings, being recommended, are supposed to be safe. Change-Id: I471be44454dcae6e73c46a473eb1eee19a5275ab Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/config.py.in M vdsm/vm.py 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/24443/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index 01590a1..075face 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -192,6 +192,9 @@ ('transient_disks_repository', '@VDSMLIBDIR@/transient', 'Local path to the transient disks repository.'), + + ('new_timekeeping_enable', 'true', + 'Enable the new recomended QEMU time keeping settings'), ]), # Section: [ksm] diff --git a/vdsm/vm.py b/vdsm/vm.py index 9371049..d3baca8 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -970,10 +970,12 @@ m = XMLElement('clock', offset='variable', adjustment=str(self.conf.get('timeOffset', 0))) m.appendChildWithArgs('timer', name='rtc', tickpolicy='catchup') - m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') - if self.arch == caps.Architecture.X86_64: - m.appendChildWithArgs('timer', name='hpet', present='no') + if config.getboolean('vars', 'new_timekeeping_enable'): + m.appendChildWithArgs('timer', name='pit', tickpolicy='delay') + + if self.arch == caps.Architecture.X86_64: + m.appendChildWithArgs('timer', name='hpet', present='no') self.dom.appendChild(m) -- To view, visit http://gerrit.ovirt.org/24443 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I471be44454dcae6e73c46a473eb1eee19a5275ab Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 23

Change in vdsm[master]: stomp: use the atomic dict.setdefault() instead for check an...
by smizrahi＠redhat.com 30 Mar '15

30 Mar '15

Saggi Mizrahi has uploaded a new change for review. Change subject: stomp: use the atomic dict.setdefault() instead for check and set ...................................................................... stomp: use the atomic dict.setdefault() instead for check and set This is faster and simpler. Change-Id: I28e4925a78328c4ac6cd0b9fc8659d6a3ee27a8f Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M lib/yajsonrpc/stomp.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/35937/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 1dda6d7..04c23ba 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -218,8 +218,7 @@ # the first header entry SHOULD be used as the value of header entry. # Subsequent values are only used to maintain a history of state # changes of the header and MAY be ignored. - if key not in headers: - headers[key] = value + headers.setdefault(key, value) return True -- To view, visit http://gerrit.ovirt.org/35937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28e4925a78328c4ac6cd0b9fc8659d6a3ee27a8f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

7 38

← Newer
1
...
11
12
13
14
15
16
17
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2014