Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2014-01-30 17:44:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2014-01-23 15:50:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2014-01-30 17:44:44.000000000 +0100 @@ -1,0 +2,56 @@ +Thu Jan 30 00:46:28 UTC 2014 - [email protected] + +- Rebased patches: + + 0001-Robustify-determination-of-root-directory.patch (only offset) + + nova-vmware-hypervisor-version.patch (only offset) + + 0001-Setup-destination-disk-from-virt_disk_size.patch (only offset) + +------------------------------------------------------------------- +Thu Jan 30 00:46:23 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev24.g05dfdb9+git.1391042783.05dfdb9: + + Make test_different_fname_concurrency less racy + + support stevedore >= 0.14 + +------------------------------------------------------------------- +Wed Jan 29 09:12:33 UTC 2014 - [email protected] + +- Add refresh_patches source service + +------------------------------------------------------------------- +Wed Jan 29 08:16:50 UTC 2014 - [email protected] + +- Use correct group name for directory ownerships. +- Do not make /var/{cache,lock,run}/nova readable by others. + +------------------------------------------------------------------- +Tue Jan 28 13:54:32 UTC 2014 - [email protected] + +- Added python-xml dependency. The 'nova-manage db sync' command + requires the minidom python module which is part of the python-xml + package. + +------------------------------------------------------------------- +Sat Jan 25 01:22:54 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev21.g1a3985c+git.1390612974.1a3985c: + + Enforce permissions in snapshots temporary dir + + Make test_poll_volume_usage_with_data more reliable + + Re-write sqlite BigInteger mapping test + +------------------------------------------------------------------- +Wed Jan 22 08:29:31 UTC 2014 - [email protected] + +- ensure nova-manage.log is owned by nova user (bnc#859691) + +------------------------------------------------------------------- +Tue Jan 21 15:11:01 UTC 2014 - [email protected] + +- fix libvirt_vif_driver default + +------------------------------------------------------------------- +Sat Jan 18 16:25:56 UTC 2014 - [email protected] + +- add 0001-Fix-for-qemu-nbd-hang.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-for-qemu-nbd-hang.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -20,7 +20,7 @@ %define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2013.2.2.dev15.ge7b2e3a+git.1388687916.e7b2e3a +Version: 2013.2.2.dev24.g05dfdb9+git.1391042783.05dfdb9 Release: 0 Summary: OpenStack Compute (Nova) - Documentation License: Apache-2.0 @@ -60,7 +60,7 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n nova-2013.2.2.dev15.ge7b2e3a +%setup -q -n nova-2013.2.2.dev24.g05dfdb9 %openstack_cleanup_prep %build ++++++ openstack-nova.spec ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2013.2.2.dev15.ge7b2e3a+git.1388687916.e7b2e3a +Version: 2013.2.2.dev24.g05dfdb9+git.1391042783.05dfdb9 Release: 0 Summary: OpenStack Compute (Nova) License: Apache-2.0 @@ -56,6 +56,7 @@ Patch13: 0001-Setup-destination-disk-from-virt_disk_size.patch # Backports of several patches: https://review.openstack.org/#/c/52954/ https://review.openstack.org/#/c/56075/ https://review.openstack.org/#/c/56174/ https://review.openstack.org/#/c/59243/ Patch30: neutron-performance.patch +Patch31: 0001-Fix-for-qemu-nbd-hang.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros @@ -136,6 +137,7 @@ Requires: python-stevedore >= 0.10 Requires: python-suds >= 0.4 Requires: python-websockify >= 0.5.1 +Requires: python-xml %description -n python-nova This package contains the core Python module of OpenStack Nova. @@ -293,7 +295,7 @@ OpenStack Nova and its components. %prep -%setup -q -n nova-2013.2.2.dev15.ge7b2e3a +%setup -q -n nova-2013.2.2.dev24.g05dfdb9 %patch1 -p1 %patch2 -p1 %patch7 -p1 @@ -304,6 +306,7 @@ %patch12 -p1 %patch13 -p1 %patch30 -p1 +%patch31 -p1 %openstack_cleanup_prep %build @@ -398,7 +401,7 @@ crudini --set %{nova_conf} DEFAULT neutron_admin_username neutron crudini --set %{nova_conf} DEFAULT neutron_admin_password '%%SERVICE_PASSWORD%%' crudini --set %{nova_conf} DEFAULT neutron_admin_tenant_name '%%SERVICE_TENANT_NAME%%' -crudini --set %{nova_conf} DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtBridgeDriver +crudini --set %{nova_conf} DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtGenericVIFDriver crudini --set %{nova_conf} DEFAULT state_path /var/lib/nova crudini --set %{nova_conf} DEFAULT lock_path %{_localstatedir}/lock/nova crudini --set %{nova_conf} DEFAULT service_neutron_metadata_proxy True @@ -549,16 +552,16 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config %{_sysconfdir}/sudoers.d/openstack-nova %dir %{_sysconfdir}/nova -%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/cache/nova +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/nova %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/api-paste.ini %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/nova.conf %config %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/policy.json %config %{_sysconfdir}/nova/rootwrap.conf %dir %{_sysconfdir}/nova/rootwrap.d -%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/nova +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/nova %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/nova -%ghost %attr(0755, %{username}, root) %{_localstatedir}/lock/nova -%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/nova +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/lock/nova +%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/nova %{_bindir}/nova-all %{_bindir}/nova-clear-rabbit-queues %{_bindir}/nova-manage ++++++ 0001-Fix-for-qemu-nbd-hang.patch ++++++ >From 2e4e10609b132a0b8ffe2271b14b42f743037134 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas <[email protected]> Date: Sun, 29 Dec 2013 19:18:04 -0500 Subject: [PATCH] Fix for qemu-nbd hang NBD device once used seem to run into intermittent trouble when used with mount repeatedly. Adding code to explicitly flush the device buffers using 'blockdev --flushbufs'. NOTE(dmllr): Also merged regression fix: Consolidate the blockdev related filters Seeing a "/usr/local/bin/nova-rootwrap: Unauthorized command" error in the logs when "blockdev --flushbufs" is executed because of the existing blockdev in compute.filters. We need to merge both into a single RegExpFilter Change-Id: Ic323ff00e5c23786a6e376e67a4ad08f92708aef Closes-Bug: #973413 Partial-Bug: #1254890 Change-Id: I2b7053b9a069d6e82f6f6baf9ad480efa4388d91 --- etc/nova/rootwrap.d/compute.filters | 4 ++++ nova/tests/virt/test_virt.py | 2 ++ nova/virt/disk/mount/api.py | 4 ++++ nova/virt/disk/mount/nbd.py | 9 +++++++++ 4 files changed, 19 insertions(+) diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters index e98c3f2..87f3d37 100644 --- a/etc/nova/rootwrap.d/compute.filters +++ b/etc/nova/rootwrap.d/compute.filters @@ -31,6 +31,10 @@ qemu-nbd: CommandFilter, qemu-nbd, root # nova/virt/disk/mount/loop.py: 'losetup', '--detach', device losetup: CommandFilter, losetup, root +# nova/virt/libvirt/utils.py: 'blockdev', '--getsize64', path +# nova/virt/disk/mount/nbd.py: 'blockdev', '--flushbufs', device +blockdev: RegExpFilter, blockdev, root, blockdev, (--getsize64|--flushbufs), /dev/.* + # nova/virt/disk/vfs/localfs.py: 'tee', canonpath tee: CommandFilter, tee, root diff --git a/nova/tests/virt/test_virt.py b/nova/tests/virt/test_virt.py index 5048fc7..6fa1a63 100644 --- a/nova/tests/virt/test_virt.py +++ b/nova/tests/virt/test_virt.py @@ -125,12 +125,14 @@ class TestVirtDisk(test.NoDBTestCase): disk_api.teardown_container('/mnt/nbd/nopart') expected_commands += [ + ('blockdev', '--flushbufs', '/dev/nbd15'), ('umount', '/dev/nbd15'), ('qemu-nbd', '-d', '/dev/nbd15'), ] disk_api.teardown_container('/mnt/nbd/part') expected_commands += [ + ('blockdev', '--flushbufs', '/dev/nbd15'), ('umount', '/dev/mapper/nbd15p1'), ('kpartx', '-d', '/dev/nbd15'), ('qemu-nbd', '-d', '/dev/nbd15'), diff --git a/nova/virt/disk/mount/api.py b/nova/virt/disk/mount/api.py index fb0ba8d..6a545b7 100644 --- a/nova/virt/disk/mount/api.py +++ b/nova/virt/disk/mount/api.py @@ -205,10 +205,14 @@ class Mount(object): """Unmount the device from the file system.""" if not self.mounted: return + self.flush_dev() LOG.debug(_("Umount %s") % self.mapped_device) utils.execute('umount', self.mapped_device, run_as_root=True) self.mounted = False + def flush_dev(self): + pass + def do_mount(self): """Call the get, map and mnt operations.""" status = False diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py index 801e25e..cc33bc6 100644 --- a/nova/virt/disk/mount/nbd.py +++ b/nova/virt/disk/mount/nbd.py @@ -129,3 +129,12 @@ class NbdMount(api.Mount): utils.execute('qemu-nbd', '-d', self.device, run_as_root=True) self.linked = False self.device = None + + def flush_dev(self): + """flush NBD block device buffer.""" + # Perform an explicit BLKFLSBUF to support older qemu-nbd(s). + # Without this flush, when a nbd device gets re-used the + # qemu-nbd intermittently hangs. + if self.device: + utils.execute('blockdev', '--flushbufs', + self.device, run_as_root=True) -- 1.8.4.1 ++++++ 0001-Robustify-determination-of-root-directory.patch ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -14,11 +14,11 @@ nova/tests/virt/xenapi/test_xenapi.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py -index a121aa2..4eb3cee 100644 ---- a/nova/tests/virt/xenapi/test_xenapi.py -+++ b/nova/tests/virt/xenapi/test_xenapi.py -@@ -3975,16 +3975,17 @@ class XenAPISessionTestCase(test.NoDBTestCase): +Index: nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/xenapi/test_xenapi.py +=================================================================== +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/tests/virt/xenapi/test_xenapi.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/xenapi/test_xenapi.py +@@ -4011,16 +4011,17 @@ class XenAPISessionTestCase(test.NoDBTes def test_verify_current_version_matches(self): session = self._get_mock_xapisession({}) @@ -43,6 +43,3 @@ for line in plugin_file: if "PLUGIN_VERSION = " in line: print line --- -1.8.4.1 - ++++++ 0001-Setup-destination-disk-from-virt_disk_size.patch ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -19,11 +19,11 @@ nova/virt/libvirt/driver.py | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) -diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py -index 5aa83fa..f8babf2 100644 ---- a/nova/tests/virt/libvirt/test_libvirt.py -+++ b/nova/tests/virt/libvirt/test_libvirt.py -@@ -3155,24 +3155,32 @@ class LibvirtConnTestCase(test.TestCase): +Index: nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/libvirt/test_libvirt.py +=================================================================== +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/tests/virt/libvirt/test_libvirt.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/libvirt/test_libvirt.py +@@ -3032,24 +3032,32 @@ class LibvirtConnTestCase(test.TestCase) db.instance_destroy(self.context, instance_ref['uuid']) @@ -63,11 +63,11 @@ def test_create_images_and_backing_disk_info_none(self): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) self.mox.StubOutWithMock(conn, '_fetch_instance_kernel_ramdisk') -diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py -index 960e7ce..9654f62 100644 ---- a/nova/virt/libvirt/driver.py -+++ b/nova/virt/libvirt/driver.py -@@ -4378,7 +4378,7 @@ class LibvirtDriver(driver.ComputeDriver): +Index: nova-2013.2.2.dev24.g05dfdb9/nova/virt/libvirt/driver.py +=================================================================== +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/virt/libvirt/driver.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/virt/libvirt/driver.py +@@ -4201,7 +4201,7 @@ class LibvirtDriver(driver.ComputeDriver instance_disk = os.path.join(instance_dir, base) if not info['backing_file'] and not os.path.exists(instance_disk): libvirt_utils.create_image(info['type'], instance_disk, @@ -76,7 +76,7 @@ elif info['backing_file']: # Creating backing file follows same way as spawning instances. cache_name = os.path.basename(info['backing_file']) -@@ -4520,7 +4520,7 @@ class LibvirtDriver(driver.ComputeDriver): +@@ -4342,7 +4342,7 @@ class LibvirtDriver(driver.ComputeDriver over_commit_size = int(virt_size) - dk_size else: backing_file = "" @@ -85,6 +85,3 @@ over_commit_size = 0 disk_info.append({'type': disk_type, --- -1.8.4.1 - ++++++ _service ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -3,4 +3,8 @@ <param name="url">http://tarballs.openstack.org/nova/nova-stable-havana.tar.gz</param> <param name="email">[email protected]</param> </service> + + <service name="refresh_patches" mode="disabled"> + <param name="changesgenerate">enable</param> + </service> </services> ++++++ nova-stable-havana.tar.gz ++++++ /work/SRC/openSUSE:Factory/openstack-nova/nova-stable-havana.tar.gz /work/SRC/openSUSE:Factory/.openstack-nova.new/nova-stable-havana.tar.gz differ: char 5, line 1 ++++++ nova-vmware-hypervisor-version.patch ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: nova-2013.2.1.dev42.gf7cfc1c/nova/utils.py +Index: nova-2013.2.2.dev24.g05dfdb9/nova/utils.py =================================================================== ---- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/utils.py -+++ nova-2013.2.1.dev42.gf7cfc1c/nova/utils.py +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/utils.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/utils.py @@ -1165,7 +1165,7 @@ def is_none_string(val): @@ -11,11 +11,11 @@ def is_neutron(): -Index: nova-2013.2.1.dev42.gf7cfc1c/nova/tests/virt/vmwareapi/test_vmwareapi.py +Index: nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/vmwareapi/test_vmwareapi.py =================================================================== ---- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/tests/virt/vmwareapi/test_vmwareapi.py -+++ nova-2013.2.1.dev42.gf7cfc1c/nova/tests/virt/vmwareapi/test_vmwareapi.py -@@ -1068,7 +1068,7 @@ class VMwareAPIVCDriverTestCase(VMwareAP +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/tests/virt/vmwareapi/test_vmwareapi.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/tests/virt/vmwareapi/test_vmwareapi.py +@@ -1074,7 +1074,7 @@ class VMwareAPIVCDriverTestCase(VMwareAP self.assertEquals(stats['memory_mb'], 1000) self.assertEquals(stats['memory_mb_used'], 500) self.assertEquals(stats['hypervisor_type'], 'VMware vCenter Server') @@ -24,10 +24,10 @@ self.assertEquals(stats['hypervisor_hostname'], self.node_name) self.assertEquals(stats['cpu_info'], jsonutils.dumps(cpu_info)) self.assertEquals(stats['supported_instances'], -Index: nova-2013.2.1.dev42.gf7cfc1c/nova/virt/vmwareapi/host.py +Index: nova-2013.2.2.dev24.g05dfdb9/nova/virt/vmwareapi/host.py =================================================================== ---- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/virt/vmwareapi/host.py -+++ nova-2013.2.1.dev42.gf7cfc1c/nova/virt/vmwareapi/host.py +--- nova-2013.2.2.dev24.g05dfdb9.orig/nova/virt/vmwareapi/host.py ++++ nova-2013.2.2.dev24.g05dfdb9/nova/virt/vmwareapi/host.py @@ -19,6 +19,7 @@ Management class for host-related functi """ ++++++ openstack-nova-network-init-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -28,7 +28,7 @@ case "$1" in start) if [ "$DAEMON" == "api" ]; then -@@ -33,6 +54,7 @@ +@@ -34,6 +55,7 @@ fi echo -n "Starting nova-$DAEMON" @@ -36,7 +36,7 @@ /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; -@@ -40,6 +62,7 @@ +@@ -41,6 +63,7 @@ echo -n "Shutting down nova-$DAEMON" /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v @@ -44,4 +44,3 @@ ;; restart) $0 stop -Binary files a/.openstack-nova-network.un~ and b/.openstack-nova-network.un~ differ ++++++ openstack-nova.init ++++++ --- /var/tmp/diff_new_pack.87GR8I/_old 2014-01-30 17:44:45.000000000 +0100 +++ /var/tmp/diff_new_pack.87GR8I/_new 2014-01-30 17:44:45.000000000 +0100 @@ -28,6 +28,7 @@ start) if [ "$DAEMON" == "api" ]; then echo -n "Checking for Nova API DB Migrations" + test -f /var/log/nova/nova-manage.log && chown $USER. /var/log/nova/nova-manage.log su $USER -s /bin/sh -c "/usr/bin/nova-manage db sync" rc_status -v fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
