Hello community, here is the log from the commit of package openstack-neutron for openSUSE:Factory checked in at 2014-04-20 11:36:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-neutron (Old) and /work/SRC/openSUSE:Factory/.openstack-neutron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-neutron" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes 2014-04-14 10:56:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes 2014-04-20 11:36:10.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 17 12:53:32 UTC 2014 - dmueller@suse.com + +- update to 2014.1: + * no change + +------------------------------------------------------------------- +Tue Apr 15 13:59:52 UTC 2014 - dmueller@suse.com + +- add 0001-Robust-detection-for-postgresql-connection-errors.patch (bnc#872361) + +------------------------------------------------------------------- Old: ---- neutron-2014.1.rc2.tar.gz New: ---- 0001-Robust-detection-for-postgresql-connection-errors.patch neutron-2014.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-neutron-doc.spec ++++++ --- /var/tmp/diff_new_pack.32xKQr/_old 2014-04-20 11:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.32xKQr/_new 2014-04-20 11:36:11.000000000 +0200 @@ -19,7 +19,7 @@ %define component neutron Name: openstack-neutron-doc -Version: 2014.1.rc2 +Version: 2014.1 Release: 0 Summary: OpenStack Virtual Network Service (Neutron) - Documentation License: Apache-2.0 ++++++ openstack-neutron.spec ++++++ --- /var/tmp/diff_new_pack.32xKQr/_old 2014-04-20 11:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.32xKQr/_new 2014-04-20 11:36:11.000000000 +0200 @@ -21,7 +21,7 @@ %define username %{component} Name: openstack-neutron -Version: 2014.1.rc2 +Version: 2014.1 Release: 0 Summary: OpenStack Network License: Apache-2.0 @@ -40,6 +40,7 @@ %endif Patch1: 0001-Only-enable-IP6Tables-managing-if-IPv6-is-available.patch Patch2: 0001-Start-ping-listener-also-for-postgresql.patch +Patch3: 0001-Robust-detection-for-postgresql-connection-errors.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros @@ -52,7 +53,7 @@ Requires: openstack-suse-sudo Requires: python >= 2.6.8 Requires: python-neutron = %{version} -Requires: python-oslo.config >= 1.2.0 +Requires: python-oslo.config >= 1.2 Provides: openstack-quantum = 2013.2.0 Obsoletes: openstack-quantum < 2013.2.0 Requires(pre): pwdutils @@ -81,24 +82,24 @@ Requires: python >= 2.6.8 Requires: python-Jinja2 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-alembic >= 0.4.1 Requires: python-amqplib >= 0.6.1 Requires: python-anyjson >= 0.3.3 -Requires: python-eventlet >= 0.13.0 +Requires: python-eventlet >= 0.13 Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.9 Requires: python-jsonrpclib -Requires: python-keystoneclient >= 0.7.0 +Requires: python-keystoneclient >= 0.7 Requires: python-kombu >= 2.4.8 Requires: python-netaddr >= 0.7.6 Requires: python-neutronclient >= 2.3.4 -Requires: python-novaclient >= 2.17.0 -Requires: python-oslo.config >= 1.2.0 +Requires: python-novaclient >= 2.17 +Requires: python-oslo.config >= 1.2 Requires: python-oslo.rootwrap Requires: python-pbr >= 0.6 Requires: python-requests >= 1.1 @@ -304,14 +305,14 @@ Summary: OpenStack Network - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-WebTest >= 2.0 +Requires: python-WebTest >= 2 Requires: python-cliff >= 1.4.3 Requires: python-configobj %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif Requires: python-fixtures >= 0.3.14 -Requires: python-mock >= 1.0 +Requires: python-mock >= 1 Requires: python-python-subunit >= 0.0.18 Requires: python-testrepository >= 0.0.18 Requires: python-testtools >= 0.9.34 @@ -326,6 +327,7 @@ %setup -q -n %{component}-%{version} %patch1 -p1 %patch2 +%patch3 -p1 %openstack_cleanup_prep %build ++++++ 0001-Robust-detection-for-postgresql-connection-errors.patch ++++++

From d9bbb042f6287061e89c1e2f96b9f70c176c871a Mon Sep 17 00:00:00 2001 From: Dirk Mueller <dirk@dmllr.de> Date: Fri, 11 Apr 2014 17:06:53 +0200 Subject: [PATCH] Robust detection for postgresql connection errors

In most cases, when the database is failing over to a new node, engine.dialect.is_disconnected() returns True. However in some cases it returns False and the exception string is "unknown error". In those cases we can however query the closed attribute on the db_connection that is set to True at that point. Change-Id: I64ef17f451780c622e1cfd257acf74e2e11e8b62 Closes-Bug: #1306668 --- openstack/common/db/sqlalchemy/session.py | 4 ++- tests/unit/db/sqlalchemy/test_sqlalchemy.py | 44 +++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) Index: neutron-2014.1.rc2/neutron/openstack/common/db/sqlalchemy/session.py =================================================================== --- neutron-2014.1.rc2.orig/neutron/openstack/common/db/sqlalchemy/session.py +++ neutron-2014.1.rc2/neutron/openstack/common/db/sqlalchemy/session.py @@ -683,7 +683,9 @@ def _ping_listener(engine, dbapi_conn, c ping_sql = 'select 1 from (values (1)) AS t1' cursor.execute(ping_sql) except Exception as ex: - if engine.dialect.is_disconnect(ex, dbapi_conn, cursor): + if (engine.dialect.is_disconnect(ex, dbapi_conn, cursor) or + ('unknown error' in str(ex).partition('\n')[0] and + getattr(dbapi_conn, 'closed', False))): msg = _('Database server has gone away: %s') % ex LOG.warning(msg) ++++++ neutron-2014.1.rc2.tar.gz -> neutron-2014.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/openstack-neutron/neutron-2014.1.rc2.tar.gz /work/SRC/openSUSE:Factory/.openstack-neutron.new/neutron-2014.1.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org