Hello community, here is the log from the commit of package openstack-cinder for openSUSE:Factory checked in at 2014-04-20 11:35:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old) and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-cinder" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes 2014-04-14 10:52:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes 2014-04-20 11:35:58.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 17 12:47:09 UTC 2014 - dmueller@suse.com + +- update to 2014.1 + * driver.create/remove_export() require elevated ctx + * Check for silent failure of tgtadm remove + +------------------------------------------------------------------- +Tue Apr 15 08:29:46 UTC 2014 - dmueller@suse.com + +- Update to version 2014.1.rc2 + * driver.create/remove_export() require elevated ctx + * Check for silent failure of tgtadm remove +- fix requires + +------------------------------------------------------------------- Old: ---- cinder-milestone-proposed.tar.gz New: ---- cinder-2014.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-cinder-doc.spec ++++++ --- /var/tmp/diff_new_pack.Of1FnC/_old 2014-04-20 11:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Of1FnC/_new 2014-04-20 11:35:59.000000000 +0200 @@ -19,13 +19,13 @@ %define component cinder Name: openstack-%{component}-doc -Version: 2014.1.dev17.g512170a +Version: 2014.1 Release: 0 Summary: OpenStack Block Storage (Cinder) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/cinder -Source: http://tarballs.openstack.org/cinder/cinder-milestone-proposed.tar.gz +Source: http://tarballs.openstack.org/cinder/cinder-%{version}.tar.gz BuildRequires: graphviz BuildRequires: openstack-suse-macros BuildRequires: python-Babel ++++++ openstack-cinder.spec ++++++ --- /var/tmp/diff_new_pack.Of1FnC/_old 2014-04-20 11:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Of1FnC/_new 2014-04-20 11:35:59.000000000 +0200 @@ -21,13 +21,13 @@ %define username %{component} Name: openstack-%{component} -Version: 2014.1.dev17.g512170a +Version: 2014.1 Release: 0 Summary: OpenStack Block Storage (Cinder) License: Apache-2.0 Group: System/Management Url: https://launchpad.net/cinder -Source: http://tarballs.openstack.org/cinder/cinder-milestone-proposed.tar.gz +Source: http://tarballs.openstack.org/cinder/cinder-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.logrotate Source3: cinder-sudoers @@ -60,7 +60,7 @@ Requires: python >= 2.6.8 Requires: python-cinder = %{version} Requires: python-kombu >= 2.4.8 -Requires: python-oslo.config >= 1.2.0 +Requires: python-oslo.config >= 1.2 Requires: python-swiftclient >= 1.6 %if 0%{?suse_version} > 1110 Requires(pre): pwdutils @@ -87,22 +87,24 @@ Requires: python >= 2.6.8 Requires: python-Babel >= 1.3 Requires: python-Paste -Requires: python-PasteDeploy >= 1.5.0 +Requires: python-PasteDeploy >= 1.5 Requires: python-Routes >= 1.12.3 Requires: python-SQLAlchemy >= 0.7.8 Requires: python-WebOb >= 1.2.3 Requires: python-amqplib >= 0.6.1 Requires: python-anyjson >= 0.3.3 -Requires: python-eventlet >= 0.13.0 -Requires: python-glanceclient >= 0.9.0 +Requires: python-eventlet >= 0.13 +Requires: python-glanceclient >= 0.9 Requires: python-greenlet >= 0.3.2 Requires: python-iso8601 >= 0.1.9 -Requires: python-keystoneclient >= 0.7.0 +Requires: python-keystoneclient >= 0.7 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.6 -Requires: python-novaclient >= 2.17.0 +Requires: python-novaclient >= 2.17 +Requires: python-oslo.messaging >= 1.3 Requires: python-oslo.rootwrap -Requires: python-paramiko >= 1.9.0 +Requires: python-paramiko >= 1.9 +Requires: python-requests >= 1.1 Requires: python-rtslib-fb >= 2.1.39 Requires: python-six >= 1.5.2 Requires: python-sqlalchemy-migrate >= 0.8.2 @@ -170,10 +172,10 @@ Requires: python-discover %endif Requires: python-fixtures >= 0.3.14 -Requires: python-glanceclient >= 0.9.0 -Requires: python-hp3parclient >= 3.0 -Requires: python-hplefthandclient >= 1.0.0 -Requires: python-mock >= 1.0 +Requires: python-glanceclient >= 0.9 +Requires: python-hp3parclient >= 3 +Requires: python-hplefthandclient >= 1 +Requires: python-mock >= 1 Requires: python-mox >= 0.5.3 Requires: python-pbr >= 0.6 Requires: python-psycopg2 @@ -186,7 +188,7 @@ functionality of OpenStack Cinder. %prep -%setup -q -n cinder-2014.1.dev17.g512170a +%setup -q -n cinder-%{version} %patch0 -p1 %openstack_cleanup_prep ++++++ cinder-milestone-proposed.tar.gz -> cinder-2014.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/ChangeLog new/cinder-2014.1/ChangeLog --- old/cinder-2014.1.dev17.g512170a/ChangeLog 2014-04-06 18:18:25.000000000 +0200 +++ new/cinder-2014.1/ChangeLog 2014-04-17 12:16:32.000000000 +0200 @@ -1,6 +1,15 @@ CHANGES ======= +2014.1 +------ + +* driver.create/remove_export() require elevated ctx +* Check for silent failure of tgtadm remove + +2014.1.rc2 +---------- + * Updated from global requirements * Append nas_opts to IBMNAS_NFSDriver configuration * Change iogrp property when retyping for Storwize/SVC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/PKG-INFO new/cinder-2014.1/PKG-INFO --- old/cinder-2014.1.dev17.g512170a/PKG-INFO 2014-04-06 18:18:25.000000000 +0200 +++ new/cinder-2014.1/PKG-INFO 2014-04-17 12:16:33.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cinder -Version: 2014.1.dev17.g512170a +Version: 2014.1 Summary: OpenStack Block Storage Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/cinder/brick/iscsi/iscsi.py new/cinder-2014.1/cinder/brick/iscsi/iscsi.py --- old/cinder-2014.1.dev17.g512170a/cinder/brick/iscsi/iscsi.py 2014-04-06 18:14:48.000000000 +0200 +++ new/cinder-2014.1/cinder/brick/iscsi/iscsi.py 2014-04-17 12:12:54.000000000 +0200 @@ -276,6 +276,30 @@ % {'vol_id': vol_id, 'e': e}) raise exception.ISCSITargetRemoveFailed(volume_id=vol_id) + # NOTE(jdg): There's a bug in some versions of tgt that + # will sometimes fail silently when using the force flag + # https://bugs.launchpad.net/ubuntu/+source/tgt/+bug/1305343 + # For now work-around by checking if the target was deleted, + # if it wasn't, try again without the force. + + # This will NOT do any good for the case of mutliple sessions + # which the force was aded for but it will however address + # the cases pointed out in bug: + # https://bugs.launchpad.net/cinder/+bug/1304122 + if self._get_target(iqn): + try: + LOG.warning(_('Silent failure of target removal ' + 'detected, retry....')) + self._execute('tgt-admin', + '--delete', + iqn, + run_as_root=True) + except putils.ProcessExecutionError as e: + LOG.error(_("Failed to remove iscsi target for volume " + "id:%(vol_id)s: %(e)s") + % {'vol_id': vol_id, 'e': e}) + raise exception.ISCSITargetRemoveFailed(volume_id=vol_id) + # NOTE(jdg): This *should* be there still but incase # it's not we don't care, so just ignore it if was # somehow deleted between entry of this method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/cinder/tests/test_iscsi.py new/cinder-2014.1/cinder/tests/test_iscsi.py --- old/cinder-2014.1.dev17.g512170a/cinder/tests/test_iscsi.py 2014-04-06 18:14:48.000000000 +0200 +++ new/cinder-2014.1/cinder/tests/test_iscsi.py 2014-04-17 12:12:55.000000000 +0200 @@ -114,6 +114,7 @@ self.flags(volumes_dir=self.persist_tempdir) self.script_template = "\n".join([ 'tgt-admin --update %(target_name)s', + 'tgt-admin --delete %(target_name)s', 'tgt-admin --force ' '--delete %(target_name)s', 'tgtadm --lld iscsi --op show --mode target']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/cinder/tests/zonemanager/test_volume_manager_fc.py new/cinder-2014.1/cinder/tests/zonemanager/test_volume_manager_fc.py --- old/cinder-2014.1.dev17.g512170a/cinder/tests/zonemanager/test_volume_manager_fc.py 2014-04-06 18:14:48.000000000 +0200 +++ new/cinder-2014.1/cinder/tests/zonemanager/test_volume_manager_fc.py 2014-04-17 12:12:55.000000000 +0200 @@ -119,7 +119,7 @@ with mock.patch.object(manager.VolumeManager, '_add_or_delete_fc_connection')\ as add_del_conn_mock: - self.terminate_connection(None, None, None, False) + self.terminate_connection(self.context_mock, None, None, False) add_del_conn_mock.assert_called_once_with(conn_info, 0) @mock.patch.object(utils, 'require_driver_initialized') @@ -131,7 +131,7 @@ as add_del_conn_mock: self.configuration.zoning_mode = 'none' self.zonemanager = None - self.terminate_connection(None, None, None, False) + self.terminate_connection(self.context_mock, None, None, False) assert not add_del_conn_mock.called @mock.patch.object(utils, 'require_driver_initialized') @@ -142,7 +142,7 @@ with mock.patch.object(manager.VolumeManager, '_add_or_delete_fc_connection')\ as add_del_conn_mock: - self.terminate_connection(None, None, None, False) + self.terminate_connection(self.context_mock, None, None, False) assert not add_del_conn_mock.called @mock.patch.object(fc_zone_manager.ZoneManager, 'add_connection') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/cinder/volume/manager.py new/cinder-2014.1/cinder/volume/manager.py --- old/cinder-2014.1.dev17.g512170a/cinder/volume/manager.py 2014-04-06 18:14:48.000000000 +0200 +++ new/cinder-2014.1/cinder/volume/manager.py 2014-04-17 12:12:57.000000000 +0200 @@ -779,7 +779,8 @@ model_update = None try: LOG.debug(_("Volume %s: creating export"), volume_id) - model_update = self.driver.create_export(context, volume) + model_update = self.driver.create_export(context.elevated(), + volume) if model_update: volume = self.db.volume_update(context, volume_id, @@ -794,10 +795,10 @@ try: conn_info = self.driver.initialize_connection(volume, connector) except Exception as err: - self.driver.remove_export(context, volume) err_msg = (_('Unable to fetch connection information from ' 'backend: %(err)s') % {'err': err}) LOG.error(err_msg) + self.driver.remove_export(context.elevated(), volume) raise exception.VolumeBackendAPIException(data=err_msg) # Add qos_specs to connection info @@ -865,7 +866,7 @@ try: LOG.debug(_("volume %s: removing export"), volume_id) - self.driver.remove_export(context, volume_ref) + self.driver.remove_export(context.elevated(), volume_ref) except Exception as ex: LOG.exception(_("Error detaching volume %(volume)s, " "due to remove export failure."), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2014.1.dev17.g512170a/cinder.egg-info/PKG-INFO new/cinder-2014.1/cinder.egg-info/PKG-INFO --- old/cinder-2014.1.dev17.g512170a/cinder.egg-info/PKG-INFO 2014-04-06 18:18:25.000000000 +0200 +++ new/cinder-2014.1/cinder.egg-info/PKG-INFO 2014-04-17 12:16:33.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cinder -Version: 2014.1.dev17.g512170a +Version: 2014.1 Summary: OpenStack Block Storage Home-page: http://www.openstack.org/ Author: OpenStack -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org