Merge lp:~jfb-tempo-consulting/unifield-server/US-4350 into lp:unifield-server

[jftempo]

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2018-08-14 14:10:58 +0000
+++ bin/osv/orm.py	2018-10-29 09:31:45 +0000
@@ -1122,6 +1122,9 @@
             self._parent_store_compute(cr)
         return (position, 0, 0, 0)
 
+    def read_web(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
+        return self.read(cr, user, ids, fields, context=context, load=load)
+
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         """
         Read records with given ids with the given fields

=== modified file 'bin/osv/osv.py'
--- bin/osv/osv.py	2016-11-04 13:19:03 +0000
+++ bin/osv/osv.py	2018-10-29 09:31:45 +0000
@@ -33,11 +33,11 @@
 from tools.translate import translate
 import time
 import random
+from threading import RLock
 
 module_list = []
 module_class_list = {}
 class_pool = {}
-
 PG_CONCURRENCY_ERRORS_TO_RETRY = (errorcodes.LOCK_NOT_AVAILABLE, errorcodes.SERIALIZATION_FAILURE, errorcodes.DEADLOCK_DETECTED)
 MAX_TRIES_ON_CONCURRENCY_FAILURE = 7
 
@@ -50,6 +50,32 @@
     except:
         pass
 
+
+class recorded_psql_pid(object):
+    _data = {}
+    _lock = RLock()
+
+    def set(self, uuid, value):
+        with self._lock:
+            self._data[uuid] = value
+
+    def delete(self, uuid):
+        with self._lock:
+            try:
+                del self._data[uuid]
+            except:
+                pass
+
+    def kill(self, cr, uuid):
+        with self._lock:
+            pg_id = self._data.get(uuid)
+            if pg_id:
+                cr.execute('select pg_terminate_backend(%s)', (pg_id,))
+                return True
+        return False
+
+_recorded_psql_pid = recorded_psql_pid()
+
 class except_osv(Exception):
     def __init__(self, name, value, exc_type='warning'):
         self.name = name
@@ -62,6 +88,7 @@
 
 
 class object_proxy(netsvc.Service):
+    _recorded_psql_pid = {}
     def __init__(self):
         self.logger = logging.getLogger('web-services')
         netsvc.Service.__init__(self, 'object_proxy', audience='')
@@ -200,10 +227,22 @@
     def execute(self, db, uid, obj, method, *args, **kw):
         before = time.time()
         cr = pooler.get_db(db).cursor()
+        uuid = False
         try:
             try:
                 if method.startswith('_'):
                     raise except_osv('Access Denied', 'Private methods (such as %s) cannot be called remotely.' % (method,))
+                if method == 'kill_search_filter' and len(args) > 0:
+                    uuid = (uid, obj, int(args[0]))
+                    if _recorded_psql_pid.kill(cr, uuid):
+                        self.logger.info('Sql query on %s killed by %s' % (obj, uid))
+                    return True
+                if method == 'read_web' and len(args) > 2 and args[2].get('unique_id'):
+                    uuid = (uid, obj, args[2]['unique_id'])
+                    _recorded_psql_pid.set(uuid, cr._cnx.get_backend_pid())
+                if method == 'search_web' and args[4].get('unique_id'):
+                    uuid = (uid, obj, args[4].get('unique_id'))
+                    _recorded_psql_pid.set(uuid, cr._cnx.get_backend_pid())
                 res = self.execute_cr(cr, uid, obj, method, *args, **kw)
                 if res is None:
                     self.logger.warning('The method %s of the object %s can not return `None` !', method, obj)
@@ -212,6 +251,8 @@
                 cr.rollback()
                 raise
         finally:
+            if uuid:
+                _recorded_psql_pid.delete(uuid)
             cr.close()
             after = time.time()
             ops_count(db, 'exec', '.'.join([obj, method]), after-before)