Change in vdsm[master]: vm iface stats: fix arithmetic
Antoni Segura Puimedon has posted comments on this change. Change subject: vm iface stats: fix arithmetic .. Patch Set 1: Code-Review+1 Good catch. I totally missed that one! -- To view, visit http://gerrit.ovirt.org/25960 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie356d5f96c73b65925b38f6149d5eb36f43023ad Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: libvirt_configure: persist cmd qemu-sanlock.conf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: libvirt_configure: persist cmd qemu-sanlock.conf
..
libvirt_configure: persist cmd qemu-sanlock.conf
On a ovirt-node if executing vdsm-tool configure --force
with libvirt sanlock enabled it will set /etc/libvirt/qemu-sanlock.conf
but won't use persist command so next reboot the changes will be lost
and vdsm-tool will complain about libvirt not configured during vdsm start.
Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Signed-off-by: Douglas Schilling Landgraf dougsl...@redhat.com
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/25968/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in
b/lib/vdsm/tool/libvirt_configure.sh.in
index eacb37c..f2f7c2c 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -318,7 +318,12 @@
# persist cmd is ovirt_store_config on ovirt-functions
if isOvirtNode; then
. /usr/libexec/ovirt-functions
-ovirt_store_config ${lconf} ${qconf} ${ldconf} ${llogr}
+ovirt_store_config \
+${lconf} \
+${ldconf} \
+${llogr} \
+${qconf} \
+${qlconf}
fi
echo Reconfiguration of libvirt is done.
--
To view, visit http://gerrit.ovirt.org/25968
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: libvirt_configure: persist cmd qemu-sanlock.conf
oVirt Jenkins CI Server has posted comments on this change. Change subject: libvirt_configure: persist cmd qemu-sanlock.conf .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6757/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7547/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7657/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25968 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I299f5cb7af4d2e09208835aeda28ec1f3c3def7d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Kiril Nesenko knese...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: move migration threads in a separate module
Francesco Romani has uploaded a new change for review.
Change subject: virt: move migration threads in a separate module
..
virt: move migration threads in a separate module
This patch moves the migration control threads
in a separate module.
No functional/behavioural changes.
Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067
Signed-off-by: Francesco Romani from...@redhat.com
---
A vdsm/migration.py
M vdsm/vm.py
2 files changed, 462 insertions(+), 430 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/25970/1
diff --git a/vdsm/migration.py b/vdsm/migration.py
new file mode 100644
index 000..a684499
--- /dev/null
+++ b/vdsm/migration.py
@@ -0,0 +1,460 @@
+#
+# Copyright 2008-2014 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 pickle
+import threading
+import time
+
+import libvirt
+
+import hooks
+import kaxmlrpclib
+from vdsm import utils
+from vdsm import vdscli
+from vdsm.config import config
+from vdsm.define import NORMAL, errCode, Mbytes
+import vmexitreason
+
+
+class MigrationSourceThread(threading.Thread):
+
+A thread that takes care of migration on the source vdsm.
+
+_ongoingMigrations = threading.BoundedSemaphore(1)
+
+@classmethod
+def setMaxOutgoingMigrations(cls, n):
+Set the initial value of the _ongoingMigrations semaphore.
+
+must not be called after any vm has been run.
+cls._ongoingMigrations = threading.BoundedSemaphore(n)
+
+def __init__(self, vm, dst='', dstparams='',
+ mode='remote', method='online',
+ tunneled=False, dstqemu='', abortOnError=False, **kwargs):
+self.log = vm.log
+self._vm = vm
+self._dst = dst
+self._mode = mode
+self._method = method
+self._dstparams = dstparams
+self._machineParams = {}
+self._tunneled = utils.tobool(tunneled)
+self._abortOnError = utils.tobool(abortOnError)
+self._dstqemu = dstqemu
+self._downtime = kwargs.get('downtime') or \
+config.get('vars', 'migration_downtime')
+self.status = {
+'status': {
+'code': 0,
+'message': 'Migration in progress'},
+'progress': 0}
+threading.Thread.__init__(self)
+self._preparingMigrationEvt = True
+self._migrationCanceledEvt = False
+self._monitorThread = None
+
+def getStat(self):
+
+Get the status of the migration.
+
+if self._monitorThread is not None:
+# fetch migration status from the monitor thread
+self.status['progress'] = self._monitorThread.progress
+return self.status
+
+def _setupVdsConnection(self):
+if self._mode == 'file':
+return
+
+# FIXME: The port will depend on the binding being used.
+# This assumes xmlrpc
+hostPort = vdscli.cannonizeHostPort(
+self._dst, self._vm.cif.bindings['xmlrpc'].serverPort)
+self.remoteHost, self.remotePort = hostPort.rsplit(':', 1)
+
+if config.getboolean('vars', 'ssl'):
+self.destServer = vdscli.connect(
+hostPort,
+useSSL=True,
+TransportClass=kaxmlrpclib.TcpkeepSafeTransport)
+else:
+self.destServer = kaxmlrpclib.Server('http://' + hostPort)
+self.log.debug('Destination server is: ' + hostPort)
+try:
+self.log.debug('Initiating connection with destination')
+status = self.destServer.getVmStats(self._vm.id)
+if not status['status']['code']:
+self.log.error(Machine already exists on the destination)
+self.status = errCode['exist']
+except Exception:
+self.log.error(Error initiating connection, exc_info=True)
+self.status = errCode['noConPeer']
+
+def _setupRemoteMachineParams(self):
+self._machineParams.update(self._vm.status())
+# patch VM config for targets 3.1
+self._patchConfigForLegacy()
+self._machineParams['elapsedTimeOffset'] = \
+
Change in vdsm[master]: virt: move migration threads in a separate module
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: move migration threads in a separate module .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6758/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7548/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7658/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: move migration threads in a separate module
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: move migration threads in a separate module .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/393/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6759/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7549/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7659/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: tools: configurator must persist usermod changes
..
tools: configurator must persist usermod changes
vdsm-tool configure --force adds to /etc/group (qemu/kvm) sanlock
but doesn't persist the file in ovirt node distro which will
affect vdsm start on next reboot. The goal for this patch is persist
the /etc/group in case vdsm-tool is running on ovirt-node.
Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562
Signed-off-by: Douglas Schilling Landgraf dougsl...@redhat.com
---
M lib/vdsm/tool/configurator.py
M lib/vdsm/utils.py
M vdsm/caps.py
M vdsm/storage/misc.py
4 files changed, 41 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/25974/1
diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index d1c876c..12cb45c 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -141,6 +141,17 @@
if rc != 0:
raise RuntimeError(Failed to perform sanlock config.)
+if utils.isOvirtNode():
+rc, out, err = utils.execCmd(
+(
+'persist',
+'/etc/group'
+)
+raw=True,
+)
+if rc != 0:
+raise RuntimeError(Failed to persist sanlock config.)
+
def isconfigured(self):
True if sanlock service is configured, False if sanlock service
diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py
index b682dec..fb36326 100644
--- a/lib/vdsm/utils.py
+++ b/lib/vdsm/utils.py
@@ -81,6 +81,15 @@
HIGH = 19
+class OSName:
+UNKNOWN = 'unknown'
+OVIRT = 'oVirt Node'
+RHEL = 'RHEL'
+FEDORA = 'Fedora'
+RHEVH = 'RHEV Hypervisor'
+DEBIAN = 'Debian'
+
+
class GeneralException(Exception):
code = 100
message = General Exception
@@ -99,11 +108,27 @@
code = 443
message = Action was stopped
+@utils.memoized
+def getos():
+if os.path.exists('/etc/rhev-hypervisor-release'):
+return OSName.RHEVH
+elif glob.glob('/etc/ovirt-node-*-release'):
+return OSName.OVIRT
+elif os.path.exists('/etc/fedora-release'):
+return OSName.FEDORA
+elif os.path.exists('/etc/redhat-release'):
+return OSName.RHEL
+elif os.path.exists('/etc/debian_version'):
+return OSName.DEBIAN
+else:
+return OSName.UNKNOWN
def isBlockDevice(path):
path = os.path.abspath(path)
return stat.S_ISBLK(os.stat(path).st_mode)
+def isOvirtNode():
+return getos() in (OSName.RHEVH, OSName.OVIRT)
def touchFile(filePath):
diff --git a/vdsm/caps.py b/vdsm/caps.py
index b260d29..a84e103 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -56,14 +56,6 @@
_glusterEnabled = False
-class OSName:
-UNKNOWN = 'unknown'
-OVIRT = 'oVirt Node'
-RHEL = 'RHEL'
-FEDORA = 'Fedora'
-RHEVH = 'RHEV Hypervisor'
-DEBIAN = 'Debian'
-
RNG_SOURCES = {'random': '/dev/random',
'hwrng': '/dev/hwrng'}
@@ -275,22 +267,6 @@
@utils.memoized
-def getos():
-if os.path.exists('/etc/rhev-hypervisor-release'):
-return OSName.RHEVH
-elif glob.glob('/etc/ovirt-node-*-release'):
-return OSName.OVIRT
-elif os.path.exists('/etc/fedora-release'):
-return OSName.FEDORA
-elif os.path.exists('/etc/redhat-release'):
-return OSName.RHEL
-elif os.path.exists('/etc/debian_version'):
-return OSName.DEBIAN
-else:
-return OSName.UNKNOWN
-
-
-@utils.memoized
def osversion():
version = release = ''
@@ -488,4 +464,4 @@
def isOvirtNode():
-return getos() in (OSName.RHEVH, OSName.OVIRT)
+return utils.isOvirtNode()
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index 6c9dd15..d24ef77 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -54,7 +54,6 @@
import storage_exception as se
import fileUtils
import logUtils
-from caps import isOvirtNode
IOUSER = vdsm
DIRECTFLAG = direct
@@ -506,7 +505,7 @@
for key in keys:
oldName = os.path.join(directory, fd[key]['old'])
newName = os.path.join(directory, fd[key]['new'])
-if isOvirtNode() and persist and not cp:
+if utils.isOvirtNode() and persist and not cp:
try:
execCmd([constants.EXT_UNPERSIST, oldName], logErr=False,
sudo=True)
@@ -517,7 +516,7 @@
try:
if cp:
execCmd([constants.EXT_CP, oldName, newName], sudo=True)
-if isOvirtNode() and persist and not os.path.exists(newName):
+if utils.isOvirtNode() and persist and not
os.path.exists(newName):
execCmd([constants.EXT_PERSIST, newName], logErr=False,
sudo=True)
@@ -525,7 +524,7 @@
Change in vdsm[master]: tools: configurator must persist usermod changes
oVirt Jenkins CI Server has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 1: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6760/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7550/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7660/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
Douglas Schilling Landgraf has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 1: Should we use approach like this or sys.append.path(/usr/share/vdsm) import caps .. caps.isOvirtNode() ? -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: move migration threads in a separate module
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: move migration threads in a separate module .. Patch Set 2: (1 comment) small silly legal thing http://gerrit.ovirt.org/#/c/25970/2/vdsm/vm.py File vdsm/vm.py: Line 1: # Line 2: # Copyright 2008-2013 Red Hat, Inc. Since you are at it, 2008-2014 Line 3: # Line 4: # This program is free software; you can redistribute it and/or modify Line 5: # it under the terms of the GNU General Public License as published by Line 6: # the Free Software Foundation; either version 2 of the License, or -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: iscsi: Specify tpgt to impose creation of a new style node r...
Federico Simoncelli has posted comments on this change. Change subject: iscsi: Specify tpgt to impose creation of a new style node record .. Patch Set 5: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/25706 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I11a6a556d31524f4fae4786f5735accaf1cefb34 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv sgot...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Sergey Gotliv sgot...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
Francesco Romani has uploaded a new change for review.
Change subject: virt: migration: add monitor thread control loop
..
virt: migration: add monitor thread control loop
This patch introduces a control loop in the
monitor thread to factor out the scheduling logic
from the worker method.
This is a necessary step toward the integration
of the MigrationMonitor and MigrationDowntime threads.
Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/migration.py
1 file changed, 24 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/25976/1
diff --git a/vdsm/migration.py b/vdsm/migration.py
index 3699ca5..1234471 100644
--- a/vdsm/migration.py
+++ b/vdsm/migration.py
@@ -392,30 +392,34 @@
return MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL 0
def run(self):
-if self.enabled:
-self.monitor_migration()
-else:
-self.idle()
+self._vm.log.debug('starting migration monitor thread')
-def monitor_migration(self):
+step = 1
+self._lastProgressTime = time.time()
+self._lowmark = None
+
+while not self._stop.isSet():
+self._stop.wait(1.0)
+if self.enabled:
+self.monitor_migration(step)
+step += 1
+
+self._vm.log.debug('migration monitor thread exiting')
+
+def monitor_migration(self, step):
def calculateProgress(remaining, total):
if remaining == 0:
return 100
progress = 100 - 100 * remaining / total if total else 0
return progress if (progress 100) else 99
-self._vm.log.debug('starting migration monitor thread')
-
memSize = int(self._vm.conf['memSize'])
maxTimePerGiB = config.getint('vars',
'migration_max_time_per_gib_mem')
migrationMaxTime = (maxTimePerGiB * memSize + 1023) / 1024
-lastProgressTime = time.time()
-lowmark = None
progress_timeout = config.getint('vars', 'migration_progress_timeout')
-while not self._stop.isSet():
-self._stop.wait(self._MIGRATION_MONITOR_INTERVAL)
+if step % self._MIGRATION_MONITOR_INTERVAL == 0:
(jobType, timeElapsed, _,
dataTotal, dataProcessed, dataRemaining,
memTotal, memProcessed, memRemaining,
@@ -432,39 +436,36 @@
now - self._startTime,
migrationMaxTime)
abort = True
-elif (lowmark is None) or (lowmark dataRemaining):
-lowmark = dataRemaining
-lastProgressTime = now
-elif (now - lastProgressTime) progress_timeout:
+elif (self._lowmark is None) or (self._lowmark dataRemaining):
+self._lowmark = dataRemaining
+self._lastProgressTime = now
+elif (now - self._lastProgressTime) progress_timeout:
# Migration is stuck, abort
self._vm.log.warn(
'Migration is stuck: Hasn\'t progressed in %s seconds. '
-'Aborting.' % (now - lastProgressTime))
+'Aborting.' % (now - self._lastProgressTime))
abort = True
if abort:
self._vm._dom.abortJob()
self.stop()
-break
+return
-if dataRemaining lowmark:
+if dataRemaining self._lowmark:
self._vm.log.warn(
'Migration stalling: remaining (%sMiB)'
' lowmark (%sMiB).'
' Refer to RHBZ#919201.',
-dataRemaining / Mbytes, lowmark / Mbytes)
+dataRemaining / Mbytes, self._lowmark / Mbytes)
if jobType == 0:
-continue
+return
self.progress = calculateProgress(dataRemaining, dataTotal)
self._vm.log.info('Migration Progress: %s seconds elapsed, %s%% of'
' data processed' %
(timeElapsed / 1000, self.progress))
-
-def idle(self):
-self._stop.wait(1.0)
def stop(self):
self._vm.log.debug('stopping migration monitor thread')
--
To view, visit http://gerrit.ovirt.org/25976
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
Francesco Romani has uploaded a new change for review.
Change subject: virt: migration: merge monitor and downtime thread
..
virt: migration: merge monitor and downtime thread
This patch merges the MigrationDowntimeThread
into the MigrationMonitorThread.
The benefits are
* less code
* less threads
* better (and simpler) integration between
migration progress tracking and downtime setting.
Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/migration.py
1 file changed, 22 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/25977/1
diff --git a/vdsm/migration.py b/vdsm/migration.py
index 1234471..8c33f1e 100644
--- a/vdsm/migration.py
+++ b/vdsm/migration.py
@@ -293,10 +293,9 @@
self._vm.log.debug('starting migration to %s '
'with miguri %s', duri, muri)
-t = MigrationDowntimeThread(self._vm, int(self._downtime))
-
self._monitorThread = MigrationMonitorThread(self._vm,
- startTime)
+ startTime,
+ int(self._downtime))
self._monitorThread.start()
try:
@@ -325,7 +324,6 @@
self._raiseAbortError()
finally:
-t.cancel()
self._monitorThread.stop()
def stop(self):
@@ -339,53 +337,24 @@
raise
-class MigrationDowntimeThread(threading.Thread):
-def __init__(self, vm, downtime):
-super(MigrationDowntimeThread, self).__init__()
-self.DOWNTIME_STEPS = config.getint('vars', 'migration_downtime_steps')
-
-self._vm = vm
-self._downtime = downtime
-self._stop = threading.Event()
-
-delay_per_gib = config.getint('vars', 'migration_downtime_delay')
-memSize = int(vm.conf['memSize'])
-self._wait = (delay_per_gib * max(memSize, 2048) + 1023) / 1024
-
-self.daemon = True
-self.start()
-
-def run(self):
-self._vm.log.debug('migration downtime thread started')
-
-for i in range(self.DOWNTIME_STEPS):
-self._stop.wait(self._wait / self.DOWNTIME_STEPS)
-
-if self._stop.isSet():
-break
-
-downtime = self._downtime * (i + 1) / self.DOWNTIME_STEPS
-self._vm.log.debug('setting migration downtime to %d', downtime)
-self._vm._dom.migrateSetMaxDowntime(downtime, 0)
-
-self._vm.log.debug('migration downtime thread exiting')
-
-def cancel(self):
-self._vm.log.debug('canceling migration downtime thread')
-self._stop.set()
-
-
class MigrationMonitorThread(threading.Thread):
_MIGRATION_MONITOR_INTERVAL = config.getint(
'vars', 'migration_monitor_interval') # seconds
-def __init__(self, vm, startTime):
+def __init__(self, vm, startTime, downTime):
super(MigrationMonitorThread, self).__init__()
self._stop = threading.Event()
self._vm = vm
self._startTime = startTime
self.daemon = True
self.progress = 0
+
+self._downtime = downTime
+delay_per_gib = config.getint('vars', 'migration_downtime_delay')
+memSize = int(vm.conf['memSize'])
+self._wait = (delay_per_gib * max(memSize, 2048) + 1023) / 1024
+self._downtime_interval = self._wait / self.DOWNTIME_STEPS
+self._downtime_step = 0
@property
def enabled(self):
@@ -402,6 +371,7 @@
self._stop.wait(1.0)
if self.enabled:
self.monitor_migration(step)
+self.monitor_downtime(step)
step += 1
self._vm.log.debug('migration monitor thread exiting')
@@ -467,6 +437,17 @@
' data processed' %
(timeElapsed / 1000, self.progress))
+def update_downtime(self, i):
+return self._downtime * (i + 1) / self.DOWNTIME_STEPS
+
+def monitor_downtime(self, step):
+if self._downtime_step self.DOWNTIME_STEPS and \
+ step % self._downtime_interval == 0:
+downtime = self.update_downtime(self._downtime_step)
+self._vm.log.debug('setting migration downtime to %d', downtime)
+self._vm._dom.migrateSetMaxDowntime(downtime, 0)
+self._downtime_step += 1
+
def stop(self):
self._vm.log.debug('stopping migration monitor thread')
self._stop.set()
--
To view, visit http://gerrit.ovirt.org/25977
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner:
Change in vdsm[master]: virt: migration: always run migration monitor
Francesco Romani has uploaded a new change for review.
Change subject: virt: migration: always run migration monitor
..
virt: migration: always run migration monitor
The migration monitor thread was run conditionally
if the migration monitor was specified.
This patch let the migration monitor always run.
If the migration monitor interval is disabled (= set to zero)
then the monitor thread will just sit idle.
This patch is a necessary step toward the unification
of MigrationMonitor and MigrationDowntime threads.
Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/migration.py
1 file changed, 17 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/25975/1
diff --git a/vdsm/migration.py b/vdsm/migration.py
index a684499..3699ca5 100644
--- a/vdsm/migration.py
+++ b/vdsm/migration.py
@@ -295,10 +295,9 @@
t = MigrationDowntimeThread(self._vm, int(self._downtime))
-if MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL:
-self._monitorThread = MigrationMonitorThread(self._vm,
- startTime)
-self._monitorThread.start()
+self._monitorThread = MigrationMonitorThread(self._vm,
+ startTime)
+self._monitorThread.start()
try:
if ('qxl' in self._vm.conf['display'] and
@@ -327,8 +326,7 @@
finally:
t.cancel()
-if MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL:
-self._monitorThread.stop()
+self._monitorThread.stop()
def stop(self):
# if its locks we are before the migrateToURI2()
@@ -389,7 +387,17 @@
self.daemon = True
self.progress = 0
+@property
+def enabled(self):
+return MigrationMonitorThread._MIGRATION_MONITOR_INTERVAL 0
+
def run(self):
+if self.enabled:
+self.monitor_migration()
+else:
+self.idle()
+
+def monitor_migration(self):
def calculateProgress(remaining, total):
if remaining == 0:
return 100
@@ -455,6 +463,9 @@
' data processed' %
(timeElapsed / 1000, self.progress))
+def idle(self):
+self._stop.wait(1.0)
+
def stop(self):
self._vm.log.debug('stopping migration monitor thread')
self._stop.set()
--
To view, visit http://gerrit.ovirt.org/25975
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: always run migration monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6761/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7551/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7661/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6762/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7552/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7662/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6763/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7553/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7663/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
Francesco Romani has uploaded a new change for review.
Change subject: virt: migration: use contextmanager for monitor
..
virt: migration: use contextmanager for monitor
This patch factors the MigrationMonitorThread
control in a context manager to make code
clearer and less cluttered.
Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8
Signed-off-by: Francesco Romani from...@redhat.com
---
M vdsm/migration.py
1 file changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/25978/1
diff --git a/vdsm/migration.py b/vdsm/migration.py
index 8c33f1e..73d29e8 100644
--- a/vdsm/migration.py
+++ b/vdsm/migration.py
@@ -18,6 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
+from contextlib import contextmanager
import pickle
import threading
import time
@@ -255,6 +256,17 @@
self._recover(str(e))
self.log.error(Failed to migrate, exc_info=True)
+@contextmanager
+def migrationMonitor(self, startTime):
+self._monitorThread = MigrationMonitorThread(self._vm,
+ startTime,
+ int(self._downtime))
+self._monitorThread.start()
+try:
+yield
+finally:
+self._monitorThread.stop()
+
def _startUnderlyingMigration(self, startTime):
if self._mode == 'file':
hooks.before_vm_hibernate(self._vm._dom.XMLDesc(0), self._vm.conf)
@@ -293,12 +305,7 @@
self._vm.log.debug('starting migration to %s '
'with miguri %s', duri, muri)
-self._monitorThread = MigrationMonitorThread(self._vm,
- startTime,
- int(self._downtime))
-self._monitorThread.start()
-
-try:
+with self.migrationMonitor(startTime):
if ('qxl' in self._vm.conf['display'] and
self._vm.conf.get('clientIp')):
SPICE_MIGRATION_HANDOVER_TIME = 120
@@ -322,9 +329,6 @@
None, maxBandwidth)
else:
self._raiseAbortError()
-
-finally:
-self._monitorThread.stop()
def stop(self):
# if its locks we are before the migrateToURI2()
--
To view, visit http://gerrit.ovirt.org/25978
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6764/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7554/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7664/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6765/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7555/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7665/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: move threads in a separate module
Francesco Romani has posted comments on this change. Change subject: virt: migration: move threads in a separate module .. Patch Set 2: (1 comment) http://gerrit.ovirt.org/#/c/25970/2/vdsm/vm.py File vdsm/vm.py: Line 1: # Line 2: # Copyright 2008-2013 Red Hat, Inc. Since you are at it, 2008-2014 Done Line 3: # Line 4: # This program is free software; you can redistribute it and/or modify Line 5: # it under the terms of the GNU General Public License as published by Line 6: # the Free Software Foundation; either version 2 of the License, or -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6766/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7556/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7666/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6767/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7557/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7667/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: move threads in a separate module
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: move threads in a separate module .. Patch Set 3: Build Failed http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/394/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6768/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7558/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7668/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: always run migration monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6769/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7559/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7669/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6770/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7560/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7670/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6771/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7561/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7671/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vm: Automatically add a serial port for a console device
Vinzenz Feenstra has uploaded a new change for review.
Change subject: vm: Automatically add a serial port for a console device
..
vm: Automatically add a serial port for a console device
Without a serial device the console support does not work for
linux systems. We switch from virtio to serial and append a serial
port if a console device was defined.
Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f
Signed-off-by: Vinzenz Feenstra vfeen...@redhat.com
---
M vdsm/vm.py
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/25979/1
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 9cb0e82..7ce7c59 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1171,6 +1171,18 @@
commandLine.appendChildWithArgs('qemu:arg', value='keyboard')
self.dom.appendChild(commandLine)
+def appendSerial(self):
+
+Add a serial port for the console device if it exists
+serial type='pty'
+target port='0'
+/serial
+
+if len(self._devices.getElementsByTagName('console')) == 1:
+s = XMLElement('serial', type='pty')
+s.appendChildWithArgs('target', port='0')
+self._devices.appendChild(s)
+
def appendGraphics(self):
Add graphics section to domain xml.
@@ -1888,7 +1900,7 @@
/console
m = self.createXmlElem('console', 'pty')
-m.appendChildWithArgs('target', type='virtio', port='0')
+m.appendChildWithArgs('target', type='serial', port='0')
return m
@@ -3025,6 +3037,7 @@
domxml.appendEmulator()
self._appendDevices(domxml)
+domxml.appendSerial()
for drive in self._devices[DISK_DEVICES][:]:
for leaseElement in drive.getLeasesXML():
--
To view, visit http://gerrit.ovirt.org/25979
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6772/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7562/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7672/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: move threads in a separate module
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: move threads in a separate module .. Patch Set 4: Build Failed http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/395/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6773/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7563/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7673/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: always run migration monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6774/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7564/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7674/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vm: Automatically add a serial port for a console device
oVirt Jenkins CI Server has posted comments on this change. Change subject: vm: Automatically add a serial port for a console device .. Patch Set 3: Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6777/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7567/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7677/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25979 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vm: Automatically add a serial port for a console device
oVirt Jenkins CI Server has posted comments on this change. Change subject: vm: Automatically add a serial port for a console device .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6778/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7568/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7678/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25979 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifa7b02a7bcaad63017c35c811a194fa42e2b694f Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 3: Code-Review-1 (1 comment) small recommendation to simplify. http://gerrit.ovirt.org/#/c/25978/3/vdsm/migration.py File vdsm/migration.py: Line 256: self._recover(str(e)) Line 257: self.log.error(Failed to migrate, exc_info=True) Line 258: Line 259: @contextmanager Line 260: def migrationMonitor(self, startTime): We could move this outside of the class (receiving the parameters it needs for creating a MigrationMonitorThread, which would be an object local to the context manager. Line 261: self._monitorThread = MigrationMonitorThread(self._vm, Line 262: startTime, Line 263: int(self._downtime)) Line 264: self._monitorThread.start() -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
Francesco Romani has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 3: (1 comment) http://gerrit.ovirt.org/#/c/25978/3/vdsm/migration.py File vdsm/migration.py: Line 256: self._recover(str(e)) Line 257: self.log.error(Failed to migrate, exc_info=True) Line 258: Line 259: @contextmanager Line 260: def migrationMonitor(self, startTime): We could move this outside of the class (receiving the parameters it needs We can and I will, with just the minor caveat that MigrationSourceThread will still need an handle to the MigrationMonitorThread to report the progress. But the move is definitely feasible and I'll do it. Line 261: self._monitorThread = MigrationMonitorThread(self._vm, Line 262: startTime, Line 263: int(self._downtime)) Line 264: self._monitorThread.start() -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 3: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: move threads in a separate module
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: move threads in a separate module .. Patch Set 4: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia69c7448b66417c7bba8ae3d301e7d777ca88067 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6779/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7569/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7679/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
Francesco Romani has posted comments on this change.
Change subject: virt: migration: merge monitor and downtime thread
..
Patch Set 3: Code-Review-1
(1 comment)
I hate to waste +1s but I need to.
http://gerrit.ovirt.org/#/c/25977/3/vdsm/migration.py
File vdsm/migration.py:
Line 370: while not self._stop.isSet():
Line 371: self._stop.wait(1.0)
Line 372: if self.enabled:
Line 373: self.monitor_migration(step)
Line 374: self.monitor_downtime(step)
This is a bug. This has to be done even if the monitor is for some reason
disabled. Will fix.
Line 375: step += 1
Line 376:
Line 377: self._vm.log.debug('migration monitor thread exiting')
Line 378:
--
To view, visit http://gerrit.ovirt.org/25977
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Francesco Romani from...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: always run migration monitor
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: always run migration monitor .. Patch Set 3: Code-Review+1 Considering the whole topic branch it makes sense -- To view, visit http://gerrit.ovirt.org/25975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4953ddda5a5c6c0ecd7ea0f95377309e18f771a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 5: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6780/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7570/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7680/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6781/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7571/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7681/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 3: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 4: Code-Review+1 I had missed the mistake you fixed :P -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
Antoni Segura Puimedon has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 5: Code-Review+1 Much better with the context manager out :-) thanks! -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
Vinzenz Feenstra has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 3: (1 comment) http://gerrit.ovirt.org/#/c/25976/3/vdsm/migration.py File vdsm/migration.py: Line 420: progress_timeout Please move the configuration out of here and make them attributes There's no reason for those values to be retrieved/recalculated every second -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: VmStatsThread: make _getNicStats testable
Dan Kenigsberg has uploaded a new change for review.
Change subject: VmStatsThread: make _getNicStats testable
..
VmStatsThread: make _getNicStats testable
With this test, the shame of change Ie356d5f96c73b6 should not repeat.
Change-Id: Ibd6ffa12341b814775bea96a47365645b571f3a8
Signed-off-by: Dan Kenigsberg dan...@redhat.com
---
M tests/vmTests.py
M vdsm/vm.py
2 files changed, 50 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/25982/1
diff --git a/tests/vmTests.py b/tests/vmTests.py
index e9efb55..96c903e 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -755,3 +755,21 @@
stats = fake.getStats()
self.assertEqual(stats['exitReason'], exitReason)
self.assertEqual(stats['exitMessage'], msg)
+
+
+class TestVmStatsThread(TestCaseBase):
+def testGetNicStats(self):
+GBPS = 10 ** 9 / 8
+with FakeVM() as fake:
+mock_stats_thread = vm.VmStatsThread(fake)
+res = mock_stats_thread._getNicStats(
+'vnettest', 'virtio', '00:11',
+(2 ** 64 - 15 * GBPS, 1, 2, 3, 0, 4, 5, 6),
+(0, 7, 8, 9, 5 * GBPS, 10, 11, 12),
+15.0)
+self.assertEqual(res, {
+'rxErrors': '8', 'rxDropped': '9',
+'txErrors': '11', 'txDropped': '12',
+'macAddr': '00:11', 'name': 'vnettest',
+'speed': '1000', 'state': 'unknown',
+'rxRate': '100.0', 'txRate': '33.3'})
diff --git a/vdsm/vm.py b/vdsm/vm.py
index b81653d..bd424b2 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -585,6 +585,35 @@
stats['cpuUser'] = 0.0
stats['cpuSys'] = 0.0
+def _getNicStats(self, name, model, mac, sInfo, eInfo, sampleInterval):
+ifSpeed = [100, 1000][model in ('e1000', 'virtio')]
+
+ifStats = {'macAddr': mac,
+ 'name': name,
+ 'speed': str(ifSpeed),
+ 'state': 'unknown'}
+
+ifStats['rxErrors'] = str(eInfo[2])
+ifStats['rxDropped'] = str(eInfo[3])
+ifStats['txErrors'] = str(eInfo[6])
+ifStats['txDropped'] = str(eInfo[7])
+
+try:
+ifRxBytes = (100.0 *
+ ((eInfo[0] - sInfo[0]) % 2 ** 32) /
+ sampleInterval / ifSpeed / self.MBPS_TO_BPS)
+ifTxBytes = (100.0 *
+ ((eInfo[4] - sInfo[4]) % 2 ** 32) /
+ sampleInterval / ifSpeed / self.MBPS_TO_BPS)
+
+logging.error('%s %s %s', eInfo[4], sInfo[4], ifTxBytes)
+ifStats['rxRate'] = '%.1f' % ifRxBytes
+ifStats['txRate'] = '%.1f' % ifTxBytes
+except (KeyError, TypeError, ZeroDivisionError):
+self._log.debug(Network stats not available)
+
+return ifStats
+
def _getNetworkStats(self, stats):
stats['network'] = {}
sInfo, eInfo, sampleInterval = self.sampleNet.getStats()
@@ -592,34 +621,10 @@
for nic in self._vm._devices[NIC_DEVICES]:
if nic.name.startswith('hostdev'):
continue
-ifSpeed = [100, 1000][nic.nicModel in ('e1000', 'virtio')]
-ifStats = {'macAddr': nic.macAddr,
- 'name': nic.name,
- 'speed': str(ifSpeed),
- 'state': 'unknown'}
-
-try:
-ifStats['rxErrors'] = str(eInfo[nic.name][2])
-ifStats['rxDropped'] = str(eInfo[nic.name][3])
-ifStats['txErrors'] = str(eInfo[nic.name][6])
-ifStats['txDropped'] = str(eInfo[nic.name][7])
-
-ifRxBytes = (100.0 *
- ((eInfo[nic.name][0] - sInfo[nic.name][0]) %
- 2 ** 32) /
- sampleInterval / ifSpeed / self.MBPS_TO_BPS)
-ifTxBytes = (100.0 *
- ((eInfo[nic.name][4] - sInfo[nic.name][4]) %
- 2 ** 32) /
- sampleInterval / ifSpeed / self.MBPS_TO_BPS)
-
-ifStats['rxRate'] = '%.1f' % ifRxBytes
-ifStats['txRate'] = '%.1f' % ifTxBytes
-except (KeyError, TypeError, ZeroDivisionError):
-self._log.debug(Network stats not available)
-
-stats['network'][nic.name] = ifStats
+stats['network'][nic.name] = self._getNicStats(
+nic.name, nic.model, nic.macAddr,
+sInfo[nic.name], eInfo[nic.name], sampleInterval)
def _getDiskStats(self, stats):
sInfo, eInfo, sampleInterval = self.sampleDisk.getStats()
--
To view, visit http://gerrit.ovirt.org/25982
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd6ffa12341b814775bea96a47365645b571f3a8
Change in vdsm[master]: VmStatsThread: make _getNicStats testable
oVirt Jenkins CI Server has posted comments on this change. Change subject: VmStatsThread: make _getNicStats testable .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6782/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7572/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7682/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25982 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd6ffa12341b814775bea96a47365645b571f3a8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Francesco Romani has posted comments on this change.
Change subject: clientIF: prepareVolumePath payload cleanup
..
Patch Set 4:
(6 comments)
http://gerrit.ovirt.org/#/c/24636/4/vdsm/clientIF.py
File vdsm/clientIF.py:
Line 281: # cdrom and floppy drives
Line 282: elif (device in ('cdrom', 'floppy') and 'specParams' in
drive):
Line 283: # this is the easy case, and a sane default.
Line 284: # Now things can get messy due to strange
combinations.
Line 285: volPath = drive.get('path', '')
If the line above move to the final else, the 2 comments above it are unnee
Nice one. Will fix.
Line 286: # vmPayload is a special case for those devices
Line 287: # which needs to be handled first.
Line 288: # caution: this code is tricky. See for example:
Line 289: # https://bugzilla.redhat.com/show_bug.cgi?id=1047356
Line 284: # Now things can get messy due to strange
combinations.
Line 285: volPath = drive.get('path', '')
Line 286: # vmPayload is a special case for those devices
Line 287: # which needs to be handled first.
Line 288: # caution: this code is tricky. See for example:
This warning does not help - I don't see anything tricky around.
Will remove.
Line 289: # https://bugzilla.redhat.com/show_bug.cgi?id=1047356
Line 290: params = drive['specParams']
Line 291: if 'vmPayload' in params:
Line 292: volPath = self._makePayloadVolume(vmId, device,
Line 291: if 'vmPayload' in params:
Line 292: volPath = self._makePayloadVolume(vmId, device,
Line 293:
params['vmPayload'])
Line 294: # better explicit than implicit, thus leave path == ''
Line 295: # for empty cdrom and floppy drives.
I don't see any value in this comment. The code is quite clear and all thes
Will reduce the comment and try to add more value to the comment
Line 296: elif (params.get('path', '') == '' and
Line 297: # line above can be removed in future, when
3.3 engine
Line 298: # is not supported
Line 299: drive.get('path', '') == ''):
Line 294: # better explicit than implicit, thus leave path == ''
Line 295: # for empty cdrom and floppy drives.
Line 296: elif (params.get('path', '') == '' and
Line 297: # line above can be removed in future, when
3.3 engine
Line 298: # is not supported
This comment was above the if in the old code, which make it more clear.
Will fix.
Line 299: drive.get('path', '') == ''):
Line 300: volPath = ''
Line 301: else:
Line 302: # we are fine with the initial value of volPath
Line 299: drive.get('path', '') == ''):
Line 300: volPath = ''
Line 301: else:
Line 302: # we are fine with the initial value of volPath
Line 303: pass
If we move the initial volPath here, the code would be more clear and we dr
Done
Line 304:
Line 305: elif path in drive:
Line 306: volPath = drive['path']
Line 307:
Line 321:
Line 322: self.log.info(prepared volume path: %s, volPath)
Line 323: return volPath
Line 324:
Line 325: def _makePayloadVolume(self, vmId, device, payload):
This name is worse than the previous name: _prepareVolumeFromPayload. Are y
Fully agree with the name. Will revert.
however pep8 1.4.6 doesn't like the indentation:
./vdsm/clientIF.py:290:25: E128 continuation line under-indented for visual
indent
will (re)introduce a temporary for this sole reason.
Line 326:
Line 327: param vmId:
Line 328: VM UUID or None
Line 329: param device:
--
To view, visit http://gerrit.ovirt.org/24636
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Eduardo ewars...@redhat.com
Gerrit-Reviewer: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Martin Polednik mpole...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins
Change in vdsm[master]: jsonrpc: StoragePool connect missing default value
Dan Kenigsberg has submitted this change and it was merged. Change subject: jsonrpc: StoragePool connect missing default value .. jsonrpc: StoragePool connect missing default value DomainsMap argument is defined in schema as optional but it is missing default value. Change-Id: Ibb5923e60314993834cf005af4ad89c21dd0dd76 Signed-off-by: pkliczewski piotr.kliczew...@gmail.com Reviewed-on: http://gerrit.ovirt.org/24641 Reviewed-by: Nir Soffer nsof...@redhat.com Reviewed-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/API.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Piotr Kliczewski: Verified Nir Soffer: Looks good to me, but someone else must approve Federico Simoncelli: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/24641 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb5923e60314993834cf005af4ad89c21dd0dd76 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Francesco Romani has posted comments on this change. Change subject: clientIF: prepareVolumePath payload cleanup .. Patch Set 4: Patch set 5: remove the ugliness introduced in the previous commit; tried to satisfy all the remarks received about the implementation of _prepareVolumePathFromPayload -- To view, visit http://gerrit.ovirt.org/24636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
oVirt Jenkins CI Server has posted comments on this change. Change subject: clientIF: prepareVolumePath payload cleanup .. Patch Set 5: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6783/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7573/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7683/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/24636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: sampling: Collect kdump status
Martin Peřina has posted comments on this change. Change subject: sampling: Collect kdump status .. Patch Set 4: Verified+1 -- To view, visit http://gerrit.ovirt.org/25926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68d7a2a24fdaad74255004af0f327197eaee65f2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: sampling: Collect kdump status
Martin Peřina has posted comments on this change. Change subject: sampling: Collect kdump status .. Patch Set 3: (1 comment) http://gerrit.ovirt.org/#/c/25926/3/vdsm/sampling.py File vdsm/sampling.py: Line 197: except: Line 198: self.thpState = 'never' Line 199: try: Line 200: self.kdumpStatus = int( Line 201: file(_KDUMP_STATUS_PATH).read().strip(\n) - you're not closing the file handle. Done Line 202: ) Line 203: except: Line 204: self.kdumpStatus = -1 Line 205: -- To view, visit http://gerrit.ovirt.org/25926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68d7a2a24fdaad74255004af0f327197eaee65f2 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: sampling: Collect kdump status
oVirt Jenkins CI Server has posted comments on this change. Change subject: sampling: Collect kdump status .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6784/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7574/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7684/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68d7a2a24fdaad74255004af0f327197eaee65f2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: Add ACPI support for VM shutdown/reboot
Dan Kenigsberg has posted comments on this change. Change subject: vdsm: Add ACPI support for VM shutdown/reboot .. Patch Set 7: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/23457 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: Add ACPI support for VM shutdown/reboot
Dan Kenigsberg has submitted this change and it was merged. Change subject: vdsm: Add ACPI support for VM shutdown/reboot .. vdsm: Add ACPI support for VM shutdown/reboot Refactored the existing shutdown/reboot code to utilize the utils.CallbackChain helper. Extracted existing code to new module vmCommands.py and split into following classes: VmPowerDown- base class handling CallbackChain functionality |-- VmShutdown - shutdown specific callbacks `-- VmReboot - reboot specific callbacks Both power-down commands now try first guestAgent (if available) and if given power-down action hasn't succeeded in given `timeout` ACPI variant will be tried (again if available). Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76 Signed-off-by: Martin Betak mbe...@redhat.com Reviewed-on: http://gerrit.ovirt.org/23457 Reviewed-by: Antoni Segura Puimedon asegu...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M debian/vdsm.install M vdsm.spec.in M vdsm/Makefile.am M vdsm/vm.py A vdsm/vmpowerdown.py 5 files changed, 124 insertions(+), 55 deletions(-) Approvals: Antoni Segura Puimedon: Looks good to me, but someone else must approve Martin Betak: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/23457 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: test: ssl reactor not tested in jsonrpc tests
Dan Kenigsberg has submitted this change and it was merged. Change subject: test: ssl reactor not tested in jsonrpc tests .. test: ssl reactor not tested in jsonrpc tests The ssl flag was not passed to constructReactor so plain tcp reactors were only used. Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d Signed-off-by: pkliczewski piotr.kliczew...@gmail.com Reviewed-on: http://gerrit.ovirt.org/24624 Reviewed-by: Nir Soffer nsof...@redhat.com Reviewed-by: Yaniv Bronhaim ybron...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M tests/jsonRpcTests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Piotr Kliczewski: Verified Nir Soffer: Looks good to me, but someone else must approve Yaniv Bronhaim: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/24624 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: test: ssl reactor not tested in jsonrpc tests
Dan Kenigsberg has posted comments on this change. Change subject: test: ssl reactor not tested in jsonrpc tests .. Patch Set 3: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/24624 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibb6dfa4d6324baa0b7091ad6713854d146ec999d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Piotr Kliczewski piotr.kliczew...@gmail.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: setupNetworks: Fix incorrect mtu overriding when adding mult...
Dan Kenigsberg has submitted this change and it was merged. Change subject: setupNetworks: Fix incorrect mtu overriding when adding multiple networks .. setupNetworks: Fix incorrect mtu overriding when adding multiple networks When configuring several networks over a bond, if the iteration over the networks to be added made networks with lower MTUs to be added after those with higher ones, the last mtu, regardless of value would be set. This was because the _netinfo object is passed from addNetworks to addNetworks and the objectivize of the succeeding addNetworks would not see the higher MTUs set by the preceding addNetworks. This would only affect the bond MTU when some bond setting would be detected as changed and it would trigger bond reconfiguring (for a list of what is checked for changes, see netmodels.py:Bond.configure). Change-Id: Ia375c2e0e4a1896ab99d734e3203a5ef49570f36 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1072411 Signed-off-by: Antoni S. Puimedon asegu...@redhat.com Reviewed-on: http://gerrit.ovirt.org/25343 Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M tests/functional/networkTests.py M vdsm/configNetwork.py 2 files changed, 39 insertions(+), 1 deletion(-) Approvals: Antoni Segura Puimedon: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/25343 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia375c2e0e4a1896ab99d734e3203a5ef49570f36 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: vdsm: Add ACPI support for VM shutdown/reboot
oVirt Jenkins CI Server has posted comments on this change. Change subject: vdsm: Add ACPI support for VM shutdown/reboot .. Patch Set 7: Build Failed http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/396/ : FAILURE -- To view, visit http://gerrit.ovirt.org/23457 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8cc4f4140913df9827cca296e880b37f47a21b76 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Betak mbe...@redhat.com Gerrit-Reviewer: Michal Skrivanek michal.skriva...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: sampling: Collect kdump status
Vinzenz Feenstra has posted comments on this change. Change subject: sampling: Collect kdump status .. Patch Set 4: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68d7a2a24fdaad74255004af0f327197eaee65f2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Martin Peřina mper...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
Francesco Romani has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 3: (1 comment) http://gerrit.ovirt.org/#/c/25976/3/vdsm/migration.py File vdsm/migration.py: Line 420: progress_timeout Please move the configuration out of here and make them attributes Done -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: merge monitor and downtime thread
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: merge monitor and downtime thread .. Patch Set 5: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6786/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7576/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7686/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25977 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ac66331b44435a9cffeb9de1454db6843245979 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: use contextmanager for monitor
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: use contextmanager for monitor .. Patch Set 6: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6785/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7575/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7685/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25978 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7fcd0bedf4f30cc0bcab03339322df1fc5434e8 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: virt: migration: add monitor thread control loop
oVirt Jenkins CI Server has posted comments on this change. Change subject: virt: migration: add monitor thread control loop .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6787/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7577/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7687/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie422bead060c8ba2bfd4bfada522b91d56697841 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: VmStatsThread: make _getNicStats testable
Antoni Segura Puimedon has posted comments on this change.
Change subject: VmStatsThread: make _getNicStats testable
..
Patch Set 1: Code-Review-1
(3 comments)
Minor things. -1 for visibility
http://gerrit.ovirt.org/#/c/25982/1/tests/vmTests.py
File tests/vmTests.py:
Line 761: def testGetNicStats(self):
Line 762: GBPS = 10 ** 9 / 8
Line 763: with FakeVM() as fake:
Line 764: mock_stats_thread = vm.VmStatsThread(fake)
Line 765: res = mock_stats_thread._getNicStats(
This method has soo many parameters that I would appreciate passing them as
keyword arguments.
Line 766: 'vnettest', 'virtio', '00:11',
Line 767: (2 ** 64 - 15 * GBPS, 1, 2, 3, 0, 4, 5, 6),
Line 768: (0, 7, 8, 9, 5 * GBPS, 10, 11, 12),
Line 769: 15.0)
Line 762: GBPS = 10 ** 9 / 8
Line 763: with FakeVM() as fake:
Line 764: mock_stats_thread = vm.VmStatsThread(fake)
Line 765: res = mock_stats_thread._getNicStats(
Line 766: 'vnettest', 'virtio', '00:11',
why use a wrongly formatted mac?
Line 767: (2 ** 64 - 15 * GBPS, 1, 2, 3, 0, 4, 5, 6),
Line 768: (0, 7, 8, 9, 5 * GBPS, 10, 11, 12),
Line 769: 15.0)
Line 770: self.assertEqual(res, {
http://gerrit.ovirt.org/#/c/25982/1/vdsm/vm.py
File vdsm/vm.py:
Line 584: self._log.debug(CPU stats not available: %s, e)
Line 585: stats['cpuUser'] = 0.0
Line 586: stats['cpuSys'] = 0.0
Line 587:
Line 588: def _getNicStats(self, name, model, mac, sInfo, eInfo,
sampleInterval):
could we have start_sample/startSample and end_sample/endSample and
s/sampleInterval/interval?
Line 589: ifSpeed = [100, 1000][model in ('e1000', 'virtio')]
Line 590:
Line 591: ifStats = {'macAddr': mac,
Line 592:'name': name,
--
To view, visit http://gerrit.ovirt.org/25982
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd6ffa12341b814775bea96a47365645b571f3a8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Nir Soffer has posted comments on this change.
Change subject: clientIF: prepareVolumePath payload cleanup
..
Patch Set 5:
(2 comments)
Looks good, but another comment can be removed, and temporary variable for pep8
is not really needed.
http://gerrit.ovirt.org/#/c/24636/5/vdsm/clientIF.py
File vdsm/clientIF.py:
Line 280:
Line 281: # cdrom and floppy drives
Line 282: elif (device in ('cdrom', 'floppy') and 'specParams' in
drive):
Line 283: # vmPayload is a special case for those devices
Line 284: # which needs to be handled first.
It is clear that we handle the vmPayload case first, the comment does add
anything, so it can be removed.
Line 285: params = drive['specParams']
Line 286: if 'vmPayload' in params:
Line 287: # pep8 1.4.6 complains otherwise
Line 288: payload = params['vmPayload']
Line 287: # pep8 1.4.6 complains otherwise
Line 288: payload = params['vmPayload']
Line 289: volPath = self._prepareVolumePathFromPayload(vmId,
Line 290:
device,
Line 291:
payload)
Pep8 allows this:
if 'vmPayload' in params:
volPath = self._prepareVolumePathFromPayload(
vmId, device, params['vmPayload'])
Line 292: # next line can be removed in future, when 3.3
engine
Line 293: # is not supported
Line 294: elif (params.get('path', '') == '' and
Line 295: drive.get('path', '') == ''):
--
To view, visit http://gerrit.ovirt.org/24636
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Eduardo ewars...@redhat.com
Gerrit-Reviewer: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Martin Polednik mpole...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Francesco Romani has posted comments on this change.
Change subject: clientIF: prepareVolumePath payload cleanup
..
Patch Set 5:
(2 comments)
http://gerrit.ovirt.org/#/c/24636/5/vdsm/clientIF.py
File vdsm/clientIF.py:
Line 280:
Line 281: # cdrom and floppy drives
Line 282: elif (device in ('cdrom', 'floppy') and 'specParams' in
drive):
Line 283: # vmPayload is a special case for those devices
Line 284: # which needs to be handled first.
It is clear that we handle the vmPayload case first, the comment does add a
Done
Line 285: params = drive['specParams']
Line 286: if 'vmPayload' in params:
Line 287: # pep8 1.4.6 complains otherwise
Line 288: payload = params['vmPayload']
Line 287: # pep8 1.4.6 complains otherwise
Line 288: payload = params['vmPayload']
Line 289: volPath = self._prepareVolumePathFromPayload(vmId,
Line 290:
device,
Line 291:
payload)
Pep8 allows this:
not sure (complains locally). Let's try.
Line 292: # next line can be removed in future, when 3.3
engine
Line 293: # is not supported
Line 294: elif (params.get('path', '') == '' and
Line 295: drive.get('path', '') == ''):
--
To view, visit http://gerrit.ovirt.org/24636
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Eduardo ewars...@redhat.com
Gerrit-Reviewer: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Martin Polednik mpole...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
oVirt Jenkins CI Server has posted comments on this change. Change subject: clientIF: prepareVolumePath payload cleanup .. Patch Set 6: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6788/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7578/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7688/ : FAILURE -- To view, visit http://gerrit.ovirt.org/24636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
Hello Federico Simoncelli, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/25985
to review the following change.
Change subject: spec: add missing requirement for sanlock on el7
..
spec: add missing requirement for sanlock on el7
In the el7 section we were missing the sanlock and sanlock-python
requirements.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1064042
Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4
Signed-off-by: Federico Simoncelli fsimo...@redhat.com
Reviewed-on: http://gerrit.ovirt.org/25173
Reviewed-by: Dan Kenigsberg dan...@redhat.com
Tested-by: Dan Kenigsberg dan...@redhat.com
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/25985/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 91b9590..581d294 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -152,6 +152,8 @@
Requires: iscsi-initiator-utils = 6.2.0.873-3
%endif
+Requires: sanlock = 2.8, sanlock-python
+
%if 0%{?rhel}
Requires: python-ethtool = 0.6-3
%if 0%{?rhel} = 7
@@ -175,7 +177,6 @@
Requires: e2fsprogs = 1.41.12-11
Requires: fence-agents
Requires: kernel = 2.6.32-279.9.1
-Requires: sanlock = 2.8, sanlock-python
Requires: initscripts = 9.03.31-2.el6_3.1
Requires: policycoreutils = 2.0.83-19.30
Requires: policycoreutils-python = 2.0.83-19.30
@@ -204,7 +205,6 @@
%endif
Requires: device-mapper-multipath = 0.4.9-18
Requires: e2fsprogs = 1.41.14
-Requires: sanlock = 2.8, sanlock-python
Requires: policycoreutils-python
Requires: sed = 4.2.1-10
Requires: ed
--
To view, visit http://gerrit.ovirt.org/25985
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: use Requires %{name}
Hello Kiril Nesenko, Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/25986
to review the following change.
Change subject: spec: use Requires %{name}
..
spec: use Requires %{name}
We should use macros instead of static names in the spec.
If in the future we decide to use different name for vdsm package
it's a matter to put the new package name in Name session.
Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Signed-off-by: Douglas Schilling Landgraf dougsl...@redhat.com
Reviewed-on: http://gerrit.ovirt.org/24301
Reviewed-by: Kiril Nesenko knese...@redhat.com
Reviewed-by: Dan Kenigsberg dan...@redhat.com
---
M vdsm.spec.in
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/25986/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 581d294..4347840 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -349,7 +349,7 @@
%package debug-plugin
Summary:VDSM Debug Plugin
-Requires: vdsm
+Requires: %{name}
Requires: %{name}-xmlrpc = %{version}-%{release}
BuildArch: noarch
@@ -358,7 +358,7 @@
%package tests
Summary:VDSM Test Suite
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: dracut
Requires: python-nose
BuildArch: noarch
@@ -369,7 +369,7 @@
%package hook-checkimages
Summary:Qcow2 disk image format check hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-checkimages
VDSM hook used to perform consistency check on a qcow2 format disk image
@@ -388,7 +388,7 @@
%package hook-faqemu
Summary:Fake qemu process for VDSM quality assurance
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-faqemu
VDSM hook used for testing VDSM with multiple fake virtual machines without
@@ -416,7 +416,7 @@
%package hook-extnet
Summary:Force a vNIC to connect to a specific libvirt network
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description hook-extnet
VDSM hook which allows to connect a vNIC to a libvirt network that is managed
@@ -507,7 +507,7 @@
%package hook-qemucmdline
Summary:QEMU cmdline hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-qemucmdline
Provides support for injecting QEMU cmdline via VDSM hook.
@@ -561,7 +561,7 @@
%package hook-vmfex-dev
Summary:VM-FEX vNIC support for VDSM
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Conflicts: hook-vmfex
%description hook-vmfex-dev
--
To view, visit http://gerrit.ovirt.org/25986
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Kiril Nesenko knese...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
oVirt Jenkins CI Server has posted comments on this change. Change subject: spec: add missing requirement for sanlock on el7 .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_3.4_install_rpm_sanity_gerrit/25/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: use Requires %{name}
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spec: use Requires %{name}
..
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_3.4_install_rpm_sanity_gerrit/26/ : FAILURE
--
To view, visit http://gerrit.ovirt.org/25986
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Kiril Nesenko knese...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
Douglas Schilling Landgraf has posted comments on this change. Change subject: spec: add missing requirement for sanlock on el7 .. Patch Set 1: Verified+1 Helps rhel7 build -- To view, visit http://gerrit.ovirt.org/25985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
Douglas Schilling Landgraf has posted comments on this change. Change subject: spec: add missing requirement for sanlock on el7 .. Patch Set 1: helps el7 build which is based on 3.4 -- To view, visit http://gerrit.ovirt.org/25985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: use Requires %{name}
Douglas Schilling Landgraf has posted comments on this change.
Change subject: spec: use Requires %{name}
..
Patch Set 1: Verified+1
helps el7 build which is based on 3.4. Jenkins failure not related to patch.
--
To view, visit http://gerrit.ovirt.org/25986
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6a20093e59990127598d70918b62ab9ea3d5c429
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com
Gerrit-Reviewer: Kiril Nesenko knese...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.4]: spec: add missing requirement for sanlock on el7
Douglas Schilling Landgraf has posted comments on this change. Change subject: spec: add missing requirement for sanlock on el7 .. Patch Set 1: jenkins failured not related to the patch. -- To view, visit http://gerrit.ovirt.org/25985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf9a6ae3386e4312861d7659da696f94498d7de4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.4 Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: block: use the contextmanager for mapMetaOffset
Federico Simoncelli has uploaded a new change for review. Change subject: block: use the contextmanager for mapMetaOffset .. block: use the contextmanager for mapMetaOffset Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Signed-off-by: Federico Simoncelli fsimo...@redhat.com --- M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py M vdsm/storage/imageRepository/formatConverter.py 3 files changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/25988/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index cac59fa..02c7dfd 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -29,6 +29,7 @@ import time import functools from collections import namedtuple +from contextlib import contextmanager from operator import itemgetter from vdsm.config import config @@ -732,11 +733,15 @@ newsize = self.metaSize(self.sdUUID) lvm.extendLV(self.sdUUID, sd.METADATA, newsize) +_mdSlotLock = threading.Lock() + +@contextmanager def mapMetaOffset(self, vol_name, slotSize): -if self.getVersion() in VERS_METADATA_LV: -return self.getVolumeMetadataOffsetFromPvMapping(vol_name) -else: -return self.getFreeMetadataSlot(slotSize) +with self._mdSlotLock: +if self.getVersion() in VERS_METADATA_LV: +yield self.getVolumeMetadataOffsetFromPvMapping(vol_name) +else: +yield self.getFreeMetadataSlot(slotSize) def _getOccupiedMetadataSlots(self): stripPrefix = lambda s, pfx: s[len(pfx):] diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 36bfa1f..9a7fa81 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -73,7 +73,6 @@ class BlockVolume(volume.Volume): Actually represents a single volume (i.e. part of virtual disk). -_tagCreateLock = threading.Lock() def __init__(self, repoPath, sdUUID, imgUUID, volUUID): self.metaoff = None @@ -169,8 +168,7 @@ imgUUID, volUUID, srcImgUUID, srcVolUUID) volParent.clone(imgPath, volUUID, volFormat, preallocate) -with cls._tagCreateLock: -mdSlot = dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) +with dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS) as mdSlot: mdTags = [%s%s % (TAG_PREFIX_MD, mdSlot), %s%s % (TAG_PREFIX_PARENT, srcVolUUID), %s%s % (TAG_PREFIX_IMAGE, imgUUID)] diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index c701163..11a0039 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -180,9 +180,9 @@ metaOffset, vol.volUUID) metaContent = vol.getMetadata() -with vol._tagCreateLock: -newMetaOffset = domain.mapMetaOffset( -vol.volUUID, blockVolume.VOLUME_MDNUMBLKS) +with domain.mapMetaOffset( +vol.volUUID, blockVolume.VOLUME_MDNUMBLKS) \ +as newMetaOffset: if newMetaOffset metaMaxSlot: raise se.NoSpaceLeftOnDomain(domain.sdUUID) -- To view, visit http://gerrit.ovirt.org/25988 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: block: use the contextmanager for mapMetaOffset
Federico Simoncelli has posted comments on this change. Change subject: block: use the contextmanager for mapMetaOffset .. Patch Set 1: (1 comment) http://gerrit.ovirt.org/#/c/25988/1//COMMIT_MSG Commit Message: Line 4: Commit: Federico Simoncelli fsimo...@redhat.com Line 5: CommitDate: 2014-03-21 14:24:12 -0400 Line 6: Line 7: block: use the contextmanager for mapMetaOffset Line 8: TODO: commit message Line 9: Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 -- To view, visit http://gerrit.ovirt.org/25988 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: block: use the contextmanager for mapMetaOffset
Federico Simoncelli has posted comments on this change. Change subject: block: use the contextmanager for mapMetaOffset .. Patch Set 1: (1 comment) http://gerrit.ovirt.org/#/c/25988/1/vdsm/storage/blockSD.py File vdsm/storage/blockSD.py: Line 735: Line 736: _mdSlotLock = threading.Lock() Line 737: Line 738: @contextmanager Line 739: def mapMetaOffset(self, vol_name, slotSize): acquireNewMetaOffset? Line 740: with self._mdSlotLock: Line 741: if self.getVersion() in VERS_METADATA_LV: Line 742: yield self.getVolumeMetadataOffsetFromPvMapping(vol_name) Line 743: else: -- To view, visit http://gerrit.ovirt.org/25988 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: block: use the contextmanager for mapMetaOffset
oVirt Jenkins CI Server has posted comments on this change. Change subject: block: use the contextmanager for mapMetaOffset .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6789/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7579/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7689/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25988 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1496238ea4f9a1902f816b20959ce3379e87871 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
oVirt Jenkins CI Server has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 2: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6790/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7580/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7690/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Nir Soffer has posted comments on this change. Change subject: clientIF: prepareVolumePath payload cleanup .. Patch Set 6: Code-Review+1 The pep8 error seems like issue in the slave. -- To view, visit http://gerrit.ovirt.org/24636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Martin Polednik mpole...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clientIF: prepareVolumePath payload cleanup
Nir Soffer has posted comments on this change.
Change subject: clientIF: prepareVolumePath payload cleanup
..
Patch Set 6:
(1 comment)
http://gerrit.ovirt.org/#/c/24636/6/vdsm/clientIF.py
File vdsm/clientIF.py:
Line 282: elif (device in ('cdrom', 'floppy') and 'specParams' in
drive):
Line 283: params = drive['specParams']
Line 284: if 'vmPayload' in params:
Line 285: volPath = self._prepareVolumePathFromPayload(vmId,
Line 286: device, params['vmPayload'])
This works with pep8:
if 'vmPayload' in params:
volPath = self._prepareVolumePathFromPayload(
vmId, device, params['vmPayload'])
But your version is better; we are wasting our time on this pep8 indentation
brokenness.
Line 287: # next line can be removed in future, when 3.3
engine
Line 288: # is not supported
Line 289: elif (params.get('path', '') == '' and
Line 290: drive.get('path', '') == ''):
--
To view, visit http://gerrit.ovirt.org/24636
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I058206b7506ddbb5ec087c9ea0963a10ed57affb
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Eduardo ewars...@redhat.com
Gerrit-Reviewer: Francesco Romani from...@redhat.com
Gerrit-Reviewer: Martin Polednik mpole...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Vinzenz Feenstra vfeen...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
oVirt Jenkins CI Server has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 3: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6791/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7581/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7691/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
oVirt Jenkins CI Server has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6792/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7582/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7692/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: libvirt_configure: move unpersist up
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: libvirt_configure: move unpersist up
..
libvirt_configure: move unpersist up
On commit b4efa0036e065 we have fixed the failure on
mv command to logrotate file but a few lines above vdsm
executes a sed which also requires the file be unpersist before it.
This patch move the unpersist command some lines above.
Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d
Signed-off-by: Douglas Schilling Landgraf dougsl...@redhat.com
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/25990/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in
b/lib/vdsm/tool/libvirt_configure.sh.in
index eacb37c..db713f9 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -298,16 +298,16 @@
}
## end of configuration section by vdsm
EOF
-# Backup (comment) original logrotate.d/libvirtd
-@SED_PATH@ -i 's/^/# VDSM backup/' $llogr
-@SED_PATH@ -e /# vdsm/,/# end vdsm/d ${llogr} ${stanza}
-local oldmod=`/usr/bin/stat --format=%a ${llogr}`
-
# unpersist cmd is remove_config on ovirt-functions
if isOvirtNode; then
. /usr/libexec/ovirt-functions
remove_config ${llogr}
fi
+# Backup (comment) original logrotate.d/libvirtd
+@SED_PATH@ -i 's/^/# VDSM backup/' $llogr
+@SED_PATH@ -e /# vdsm/,/# end vdsm/d ${llogr} ${stanza}
+local oldmod=`/usr/bin/stat --format=%a ${llogr}`
+
@MV_PATH@ ${stanza} ${llogr}
if [ -n ${oldmod} ]; then
--
To view, visit http://gerrit.ovirt.org/25990
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: libvirt_configure: move unpersist up
oVirt Jenkins CI Server has posted comments on this change. Change subject: libvirt_configure: move unpersist up .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6793/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7583/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7693/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25990 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: libvirt_configure: move unpersist up
Douglas Schilling Landgraf has posted comments on this change. Change subject: libvirt_configure: move unpersist up .. Patch Set 1: Verified+1 -- To view, visit http://gerrit.ovirt.org/25990 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: pre-start: touch/configure vdsm logs
Dan Kenigsberg has posted comments on this change. Change subject: pre-start: touch/configure vdsm logs .. Patch Set 5: If I recall correctly, doing this in pre-start is too late: the files are created as root by vdsm-tool that is run before the service is started. -- To view, visit http://gerrit.ovirt.org/25912 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ca927cb447eeb24195cff6a1174e0f9a7295214 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Doron Fediuck dfedi...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Kiril Nesenko knese...@redhat.com Gerrit-Reviewer: Ryan Barry rba...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: VmStatsThread: make _getNicStats testable
oVirt Jenkins CI Server has posted comments on this change. Change subject: VmStatsThread: make _getNicStats testable .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6794/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7584/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7694/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25982 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd6ffa12341b814775bea96a47365645b571f3a8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tools: configurator must persist usermod changes
Douglas Schilling Landgraf has posted comments on this change. Change subject: tools: configurator must persist usermod changes .. Patch Set 4: Verified+1 installed ovirt-node, host became UP. rebooted host, vdsm starting correctly. -- To view, visit http://gerrit.ovirt.org/25974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id4a7dea08bac41ff557aa52826463f2bdf481562 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Barak Azulay bazu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsl...@redhat.com Gerrit-Reviewer: Fabian Deutsch fabi...@fedoraproject.org Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
