[vdsm] update to vdsm-4.10.3-14
Federico Simoncelli
fsimonce at fedoraproject.org
Mon Apr 8 18:55:03 UTC 2013
commit 7fe9c509657955aafd9f82e65e65bb3c4afc6437
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Mon Apr 8 17:59:00 2013 +0200
update to vdsm-4.10.3-14
- fix storage.fuser
- Bump up libvirt version to fix network linking.
0038-fix-storage.fuser.patch | 85 ++++++++++++++++++++
...up-libvirt-version-to-fix-network-linking.patch | 36 ++++++++
vdsm.spec | 12 +++-
3 files changed, 131 insertions(+), 2 deletions(-)
---
diff --git a/0038-fix-storage.fuser.patch b/0038-fix-storage.fuser.patch
new file mode 100644
index 0000000..7d2989e
--- /dev/null
+++ b/0038-fix-storage.fuser.patch
@@ -0,0 +1,85 @@
+From af3c0b0472f443c5c21a169b166cc1ee294d1606 Mon Sep 17 00:00:00 2001
+From: Dan Kenigsberg <danken at redhat.com>
+Date: Sun, 24 Mar 2013 12:05:23 +0200
+Subject: [PATCH 38/39] fix storage.fuser
+
+Bug-Url: https://bugzilla.redhat.com/922515
+Change-Id: Iabd58847db7090f83106d30a763d09c0a7b78741
+Signed-off-by: Dan Kenigsberg <danken at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/13302
+Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Tested-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/13303
+Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
+---
+ tests/Makefile.am | 1 +
+ tests/fuserTests.py | 31 +++++++++++++++++++++++++++++++
+ vdsm/storage/fuser.py | 2 +-
+ 3 files changed, 33 insertions(+), 1 deletion(-)
+ create mode 100644 tests/fuserTests.py
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8ad34e2..9aec750 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -27,6 +27,7 @@ test_modules = \
+ capsTests.py \
+ configNetworkTests.py \
+ fileUtilTests.py \
++ fuserTests.py \
+ getAllVolumesTests.py \
+ glusterTestData.py \
+ gluster_cli_tests.py \
+diff --git a/tests/fuserTests.py b/tests/fuserTests.py
+new file mode 100644
+index 0000000..7473dde
+--- /dev/null
++++ b/tests/fuserTests.py
+@@ -0,0 +1,31 @@
++#
++# Copyright 2013 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 os
++from storage import fuser
++
++from testrunner import VdsmTestCase
++
++
++class TestFuser(VdsmTestCase):
++
++ def testSelfExe(self):
++ pid = os.getpid()
++ self.assertTrue(pid in fuser.fuser('/proc/%s/exe' % pid))
+diff --git a/vdsm/storage/fuser.py b/vdsm/storage/fuser.py
+index d9becbc..135dad6 100644
+--- a/vdsm/storage/fuser.py
++++ b/vdsm/storage/fuser.py
+@@ -27,7 +27,7 @@ def fuser(path, mountPoint=False):
+ cmd.append("-m")
+
+ cmd.append(path)
+- (rc, out, err) = misc.execCmd(cmd, sudo=True)
++ (rc, out, err) = misc.execCmd(cmd, raw=True, sudo=True)
+ if rc != 0:
+ return []
+
+--
+1.8.1.4
+
diff --git a/0039-Bump-up-libvirt-version-to-fix-network-linking.patch b/0039-Bump-up-libvirt-version-to-fix-network-linking.patch
new file mode 100644
index 0000000..455971f
--- /dev/null
+++ b/0039-Bump-up-libvirt-version-to-fix-network-linking.patch
@@ -0,0 +1,36 @@
+From 3a99d6d89d9f978052baee3c27fb58316f12b863 Mon Sep 17 00:00:00 2001
+From: "Antoni S. Puimedon" <asegurap at redhat.com>
+Date: Thu, 31 Jan 2013 17:32:07 +0100
+Subject: [PATCH 39/39] Bump up libvirt version to fix network linking.
+
+The libvirt feature leveraged for the Network linking feature had
+a bug that made it fail when the vnic had a bootorder set. See
+https://bugzilla.redhat.com/906446 . This was solved and has been marked
+for backport (which did not yet happen) for the version this patch
+sets).
+
+Change-Id: Ib9e96eb0192fbea35d2723cafbec145b629371fa
+Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/11600
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Tested-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index 60e76e5..14922e0 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -119,7 +119,7 @@ Requires: logrotate < 3.8.0
+ Requires: python >= 2.7.3
+ Requires: qemu-kvm >= 2:0.15.0-4
+ Requires: qemu-img >= 2:0.15.0-4
+-Requires: libvirt >= 0.10.1-1
++Requires: libvirt >= 0.10.2.4-1
+ Requires: iscsi-initiator-utils >= 6.2.0.872-14
+ Requires: device-mapper-multipath >= 0.4.9-18
+ Requires: e2fsprogs >= 1.41.14
+--
+1.8.1.4
+
diff --git a/vdsm.spec b/vdsm.spec
index 722f49b..473729a 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -35,7 +35,7 @@
Name: %{vdsm_name}
Version: 4.10.3
-Release: 13%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release: 14%{?vdsm_relvtag}%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -90,6 +90,8 @@ Patch33: 0034-bootstrap-remove-glusterfs-packages.patch
Patch34: 0035-gluster-set-glusterfs-dependency-version.patch
Patch35: 0036-Do-not-delete-the-template-when-zeroing-a-dependant-.patch
Patch36: 0037-vdsm.spec-fence-agents-all.patch
+Patch37: 0038-fix-storage.fuser.patch
+Patch38: 0039-Bump-up-libvirt-version-to-fix-network-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -186,7 +188,7 @@ Requires: fence-agents
Requires: python >= 2.7.3
Requires: qemu-kvm >= 2:0.15.0-4
Requires: qemu-img >= 2:0.15.0-4
-Requires: libvirt >= 0.10.1-1
+Requires: libvirt >= 0.10.2.4-1
Requires: iscsi-initiator-utils >= 6.2.0.872-14
Requires: device-mapper-multipath >= 0.4.9-18
Requires: e2fsprogs >= 1.41.14
@@ -520,6 +522,8 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%patch34 -p1 -b .patch34
%patch35 -p1 -b .patch35
%patch36 -p1 -b .patch36
+%patch37 -p1 -b .patch37
+%patch38 -p1 -b .patch38
%if 0%{?rhel} == 6
sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1118,6 +1122,10 @@ exit 0
%endif
%changelog
+* Mon Apr 8 2013 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-14
+- fix storage.fuser
+- Bump up libvirt version to fix network linking.
+
* Wed Apr 3 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-13
- Temporarily deactivate Gluster sub-package.
More information about the scm-commits
mailing list