vdsm-patches April 2013

vdsm-patches@lists.fedorahosted.org

46 participants
465 discussions

Change in vdsm[master]: Checking syslog availability before starting vdsm
by ybronhei＠redhat.com 09 Apr '13

09 Apr '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Checking syslog availability before starting vdsm ...................................................................... Checking syslog availability before starting vdsm If logger is not able to open /dev/log, it throws exception and vdsm does not start. This path verifies that this file exist and fail vdsm start if not. Change-Id: I60d0537f67da3cf81477760ccb3760a103dc15ac Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=928861 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/vdsmd.init.in 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/13547/1 diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in index c804ce8..a836991 100755 --- a/vdsm/vdsmd.init.in +++ b/vdsm/vdsmd.init.in @@ -30,6 +30,7 @@ PIDFILE=@VDSMRUNDIR@/vdsmd.pid RESPAWNPIDFILE=@VDSMRUNDIR@/respawn.pid CORE_DUMP_PATH=/var/log/core/core.%p.%t.dump +SYS_LOG_PATH=/dev/log DOM_METADATA_BACKUP_DIR=/var/log/vdsm/backup CORE_PATTERN=/proc/sys/kernel/core_pattern QEMU_DUMP_PATH="/var/log/core" @@ -133,6 +134,10 @@ fi done return 0 +} + +syslog_available() { + [[ -x "$SYS_LOG_PATH" ]] } libvirt_should_use_upstart() { @@ -439,6 +444,12 @@ start() { local ret_val + + if ! syslog_available; then + log_failure_msg "Cannot communicate with see log. Check rsyslog.conf" + return 1 + fi + python @VDSMDIR@/hooks.pyc before_vdsm_start shutdown_conflicting_srv && stop_libvirtd_sysv -- To view, visit http://gerrit.ovirt.org/13547 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60d0537f67da3cf81477760ccb3760a103dc15ac Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 32

Change in vdsm[master]: vdsm: Ignore after_vm_cont hook if _dom was not yet created
by Vinzenz Feenstra 09 Apr '13

09 Apr '13

Vinzenz Feenstra has uploaded a new change for review. Change subject: vdsm: Ignore after_vm_cont hook if _dom was not yet created ...................................................................... vdsm: Ignore after_vm_cont hook if _dom was not yet created There's a race condition happening which results in an exception because the domain has not yet being assigned/created. This is a workaround to fix the exception from happening, however this is not a long term solution. Change-Id: I0e36f988c965b51855861f04bcebee5ad51d3b09 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/libvirtvm.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/12558/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index e2ada06..d76fadf 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -3035,7 +3035,17 @@ elif event == libvirt.VIR_DOMAIN_EVENT_RESUMED: self._guestCpuRunning = True if detail == libvirt.VIR_DOMAIN_EVENT_RESUMED_UNPAUSED: - hooks.after_vm_cont(self._dom.XMLDesc(0), self.conf) + # This is not a real solution however the safest way to handle + # this for now. Ultimately we need to change the way how we are + # creating self._dom. + # The event handler delivers the domain instance in the + # callback however we do not use it. + try: + domxml = self._dom.XMLDesc(0) + except AttributeError: + pass + else: + hooks.after_vm_pause(domxml, self.conf) elif (detail == libvirt.VIR_DOMAIN_EVENT_RESUMED_MIGRATED and self.lastStatus == 'Migration Destination'): self._incomingMigrationFinished.set() -- To view, visit http://gerrit.ovirt.org/12558 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e36f988c965b51855861f04bcebee5ad51d3b09 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 23

Change in vdsm[master]: vdsm: fix Vm cleanup routine
by peet＠redhat.com 09 Apr '13

09 Apr '13

Peter V. Saveliev has uploaded a new change for review. Change subject: vdsm: fix Vm cleanup routine ...................................................................... vdsm: fix Vm cleanup routine The issue was that on Vm disk hot unplug the general clean up routine was called, that wiped out also qemu and ovirt guest agent's sockets. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=927143 Signed-off-by: Peter V. Saveliev <peet(a)redhat.com> Change-Id: Ie355022866d008a83257b1b6e3a4226a07d34c2f --- M vdsm/libvirtvm.py M vdsm/vm.py 2 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/13610/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 40bcd69..6fd269e 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1371,7 +1371,12 @@ self._guestEventTime = self._startTime def _cleanup(self): - vm.Vm._cleanup(self) + """ + General clean up routine + """ + self._cleanupDrives() + self._cleanupGuestAgent() + self._cleanupState() utils.rmFile(self._qemuguestSocketFile) def updateGuestCpuRunning(self): @@ -1871,7 +1876,7 @@ else: hooks.after_disk_hotunplug(driveXml, self.conf, params=params.get('custom', {})) - self._cleanup() + self._cleanupDrives() return {'status': doneCode, 'vmList': self.status()} diff --git a/vdsm/vm.py b/vdsm/vm.py index 66ffeb2..197794b 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -1030,7 +1030,10 @@ except: self.log.error("_timedShutdown failed", exc_info=True) - def _cleanup(self): + def _cleanupDrives(self): + """ + Clean up drives related stuff + """ with self._volPrepareLock: for drive in self._devices[DISK_DEVICES]: try: @@ -1046,12 +1049,21 @@ except: pass + def _cleanupGuestAgent(self): + """ + Try to stop the guest agent and clean up its socket + """ try: self.guestAgent.stop() except: pass utils.rmFile(self._guestSocketFile) + + def _cleanupState(self): + """ + Clean up state file[s] + """ utils.rmFile(self._recoveryFile) def setDownStatus(self, code, reason): -- To view, visit http://gerrit.ovirt.org/13610 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie355022866d008a83257b1b6e3a4226a07d34c2f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>

5 19

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1879/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1930/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 1: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1879/ (2/2) -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 1: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1930/ (1/2) -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: vdsmd.init.in: removing /var/log/vdsm/libvirt.log
by Douglas Schilling Landgraf 09 Apr '13

09 Apr '13

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsmd.init.in: removing /var/log/vdsm/libvirt.log ...................................................................... vdsmd.init.in: removing /var/log/vdsm/libvirt.log We added it quite long ago to track libvirt lost event issues. These days we are much stable and libvirtd.log already contains libvirt informations. Change-Id: I2b777c42b29a747bfdc647af56a0e7d56c16194f Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm/vdsmd.init.in 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/13728/1 diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in index c804ce8..cca5548 100755 --- a/vdsm/vdsmd.init.in +++ b/vdsm/vdsmd.init.in @@ -505,8 +505,6 @@ echo $"Starting up vdsm daemon: " local vdsm_nice=`$GETCONFITEM $CONF_FILE vars vdsm_nice -5` - LIBVIRT_LOG_FILTERS=`$GETCONFITEM $CONF_FILE vars libvirt_log_filters "1:libvirt 1:remote"` \ - LIBVIRT_LOG_OUTPUTS=`$GETCONFITEM $CONF_FILE vars libvirt_log_outputs "1:file:/var/log/vdsm/libvirt.log"` \ LC_ALL=C NICELEVEL=$vdsm_nice daemon --user=vdsm @VDSMDIR@/respawn --minlifetime 10 --daemon --masterpid $RESPAWNPIDFILE $VDSM_BIN RETVAL=$? [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start" -- To view, visit http://gerrit.ovirt.org/13728 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b777c42b29a747bfdc647af56a0e7d56c16194f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

3 22

Change in vdsm[ovirt-3.2]: vdsm.spec.in: with_gluster
by Douglas Schilling Landgraf 09 Apr '13

09 Apr '13

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec.in: with_gluster ...................................................................... vdsm.spec.in: with_gluster Option to manage Gluster sub-package. Change-Id: I925c1b12f0447798eaae6da72d726bc007511e1c Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/13731/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 14922e0..6998bd0 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -3,6 +3,9 @@ %global vdsm_bootstrap vdsm-bootstrap %global vdsm_reg vdsm-reg +# Gluster +%global with_gluster 1 + # Required users and groups %global vdsm_user @VDSMUSER@ %global vdsm_group @VDSMGROUP@ @@ -397,6 +400,7 @@ %description hook-vmdisk Hook adds additional disk image for a VM (raw or qcow2) +%if 0%{?with_gluster} %package gluster Summary: Gluster Plugin for VDSM BuildArch: noarch @@ -409,6 +413,7 @@ %description gluster Gluster plugin enables VDSM to serve Gluster functionalities. +%endif %prep %setup -q @@ -814,8 +819,12 @@ %{_datadir}/%{vdsm_name}/tests/run_tests.sh %{_datadir}/%{vdsm_name}/tests/route_info.out %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out +%if 0%{?with_gluster} %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml +%else +%exclude %{_datadir}/%{vdsm_name}/tests/gluster* +%endif %{_datadir}/%{vdsm_name}/tests/functional/*.py* %files hook-vhostmd @@ -988,6 +997,7 @@ %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop/10_faqemu %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu +%if 0%{?with_gluster} %files gluster %defattr(-, root, root, -) %dir %{_datadir}/%{vdsm_name}/gluster @@ -997,6 +1007,10 @@ %{_datadir}/%{vdsm_name}/gluster/cli.py* %{_datadir}/%{vdsm_name}/gluster/exception.py* %{_datadir}/%{vdsm_name}/gluster/hostname.py* +%else +%exclude %{_datadir}/%{vdsm_name}/gluster/* +%endif + %changelog * Wed Oct 12 2011 Federico Simoncelli <fsimonce(a)redhat.com> - 4.9.0-0 -- To view, visit http://gerrit.ovirt.org/13731 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I925c1b12f0447798eaae6da72d726bc007511e1c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.2 Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

2 3

Change in vdsm[ovirt-3.2]: vdsm.spec: fence-agents-all
by Douglas Schilling Landgraf 09 Apr '13

09 Apr '13

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: fence-agents-all ...................................................................... vdsm.spec: fence-agents-all fence-agents package in version 4 replaced the package name to fence-agents-all. This patch will adapt vdsm spec to this change. Change-Id: Ia7933fd043e535b568ce368e8e61f44e330b25ae Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/13729/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 14922e0..a00e989 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -89,6 +89,7 @@ ExclusiveArch: x86_64 Requires: device-mapper-multipath Requires: e2fsprogs +Requires: fence-agents-all Requires: iscsi-initiator-utils Requires: libvirt Requires: lvm2 @@ -106,6 +107,7 @@ Requires: iscsi-initiator-utils >= 6.2.0.872-15 Requires: device-mapper-multipath >= 0.4.9-52 Requires: e2fsprogs >= 1.41.12-11 +Requires: fence-agents Requires: kernel >= 2.6.32-279.9.1 Requires: sanlock >= 2.3-4, sanlock-python Requires: initscripts >= 9.03.31-2.el6_3.1 @@ -115,6 +117,11 @@ Requires: logrotate < 3.8.0 %endif %else +%if 0%{?fedora} >= 19 +Requires: fence-agents-all +%else +Requires: fence-agents +%endif # Subprocess and thread bug was found on python 2.7.2 Requires: python >= 2.7.3 Requires: qemu-kvm >= 2:0.15.0-4 @@ -141,7 +148,6 @@ Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client Requires: psmisc >= 22.6-15 -Requires: fence-agents Requires: bridge-utils Requires: sos Requires: tree -- To view, visit http://gerrit.ovirt.org/13729 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7933fd043e535b568ce368e8e61f44e330b25ae Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.2 Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

2 4

Change in vdsm[master]: vdsm.spec.in: with_gluster
by Douglas Schilling Landgraf 09 Apr '13

09 Apr '13

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec.in: with_gluster ...................................................................... vdsm.spec.in: with_gluster Option to manage Gluster sub-package. Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/13542/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index dbb9d04..9c14d64 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -17,6 +17,9 @@ %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d %endif +# Gluster +%global with_gluster 1 + # Systemd macro %if 0%{?fedora} >= 15 %global with_systemd 1 @@ -453,6 +456,7 @@ %description hook-vmdisk Hook adds additional disk image for a VM (raw or qcow2) +%if 0%{?with_gluster} %package gluster Summary: Gluster Plugin for VDSM BuildArch: noarch @@ -465,6 +469,7 @@ %description gluster Gluster plugin enables VDSM to serve Gluster functionalities. +%endif %prep %setup -q @@ -754,8 +759,12 @@ %{_datadir}/%{vdsm_name}/storage/fileUtils.py* %{_datadir}/%{vdsm_name}/storage/fileVolume.py* %{_datadir}/%{vdsm_name}/storage/fuser.py* +%if 0%{?with_gluster} %{_datadir}/%{vdsm_name}/storage/glusterSD.py* %{_datadir}/%{vdsm_name}/storage/glusterVolume.py* +%else +%exclude %{_datadir}/%{vdsm_name}/storage/gluster* +%endif %{_datadir}/%{vdsm_name}/storage/hba.py* %{_datadir}/%{vdsm_name}/storage/hsm.py* %{_datadir}/%{vdsm_name}/storage/image.py* @@ -833,11 +842,15 @@ %{_datadir}/%{vdsm_name}/neterrors.py* %{_datadir}/%{vdsm_name}/respawn %{_datadir}/%{vdsm_name}/set-conf-item +%if 0%{?with_gluster} %dir %{_datadir}/%{vdsm_name}/gluster %{_datadir}/%{vdsm_name}/gluster/__init__.py* %{_datadir}/%{vdsm_name}/gluster/cli.py* %{_datadir}/%{vdsm_name}/gluster/exception.py* %{_datadir}/%{vdsm_name}/gluster/hostname.py* +%else +%exclude %{_datadir}/%{vdsm_name}/gluster/* +%endif %{python_sitelib}/sos/plugins/vdsm.py* /lib/udev/rules.d/12-vdsm-lvm.rules /etc/security/limits.d/99-vdsm.conf @@ -912,8 +925,12 @@ %{_datadir}/%{vdsm_name}/tests/route_info.out %{_datadir}/%{vdsm_name}/tests/route_info_ppc64.out %{_datadir}/%{vdsm_name}/tests/tc_filter_show.out +%if 0%{?with_gluster} %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml +%else +%exclude %{_datadir}/%{vdsm_name}/tests/gluster* +%endif %{_datadir}/%{vdsm_name}/tests/functional/*.py* %files hook-vhostmd @@ -1101,11 +1118,13 @@ %doc COPYING %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu +%if 0%{?with_gluster} %files gluster %defattr(-, root, root, -) %dir %{_datadir}/%{vdsm_name}/gluster %doc COPYING %{_datadir}/%{vdsm_name}/gluster/api.py* +%endif %changelog * Wed Oct 12 2011 Federico Simoncelli <fsimonce(a)redhat.com> - 4.9.0-0 -- To view, visit http://gerrit.ovirt.org/13542 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifebbd38d3d225c22f1f39a2f8758591066824e76 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 6

← Newer
1
...
40
41
42
43
44
45
46
47
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches April 2013