Merge lp:~openerp-dev/openobject-server/7.0-rstcnx-chs into lp:openobject-server/7.0

[Christophe Simonis (OpenERP)]

[Olivier Dony (Odoo) (odo-openerp)]

LGTM, but after testing with older psycopg2 versions I had to add a check before calling cnx.close(), as close() used to raise an Exception if the connection was already marked as closed (that is, before psycopg2 2.4.5)

Note that reset() was introduced in psycopg2 2.0.12, so we might want to make the requirement explicit in setup.py. For 7.0 we actually require the `current version from debian stable as of the release date`, and this has been 2.2.1 since 2010.

See also the rationale for this patch in the comments on https://code.launchpad.net/~florent.x/openobject-server/trunk-bug-905257-fix-reconnect/+merge/132149

[lp:~openerp-dev/openobject-server/7.0-rstcnx-chs]

4842. By Olivier Dony (Odoo) on 2013-02-16

[FIX] sql_db: immediately remove the connections from the pool when detected to be dead

Unmerged revisions

=== modified file 'openerp/sql_db.py'
--- openerp/sql_db.py	2012-12-14 12:43:10 +0000
+++ openerp/sql_db.py	2013-02-15 11:40:26 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2013 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -398,8 +398,16 @@
     def borrow(self, dsn):
         self._debug('Borrow connection to %r', dsn)
 
-        # free leaked connections
+        # free dead and leaked connections
         for i, (cnx, _) in tools.reverse_enumerate(self._connections):
+            try:
+                cnx.reset()
+            except psycopg2.OperationalError:
+                self._debug('Cannot reset connection at index %d: %r', i, cnx.dsn)
+                # psycopg2 2.4.4 and earlier do not allow closing a closed connection
+                if cnx.closed:
+                    cnx.close()
+
             if cnx.closed:
                 self._connections.pop(i)
                 self._debug('Removing closed connection at index %d: %r', i, cnx.dsn)