Merge lp:~jfb-tempo-consulting/unifield-server/us-1341 into lp:unifield-server

[jftempo]

[Jeff Allen (jr.allen)]

UF 6.0 unfortunately needs to tolerate the time when pg 8.4 and pg 9.6 is mixed in the fleet. Until now we didn't notice any use of Postgres where that would make a difference, but I'm afraid this won't work on Pg 8.4.

Your thoughts?

[jftempo (jfb-tempo-consulting)]

To my knowledge (but I didn't test this code on pg8.4):
   - pg8.4 ISOLATION_LEVEL_REPEATABLE_READ == pg8.4 ISOLATION_LEVEL_SERIALIZABLE
   - pg8.4 ISOLATION_LEVEL_SERIALIZABLE == pg9.6 ISOLATION_LEVEL_REPEATABLE_READ

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-08-18 15:27:28 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-08-29 09:52:36 +0000
@@ -98950,3 +98950,17 @@
 #: field:sync.version.instance.monitor,instance_state:0
 msgid "Instance State"
 msgstr "État de l'instance"
+
+#. module: sync_client
+#: code:addons/sync_client/sync_client.py:670
+#, python-format
+msgid "Unable to generate updates after %d tries"
+msgstr "Impossible de générer les data après %d tentatives"
+
+#. module: sync_client
+#: code:addons/sync_client/sync_client.py:677
+#, python-format
+msgid "Unable to generate updates, retrying %d/%d"
+msgstr "Impossible de générer les data, nouvel essai %d/%d"
+
+
 
=== modified file 'bin/addons/sync_client/orm.py'
--- bin/addons/sync_client/orm.py	2017-02-20 09:08:28 +0000
+++ bin/addons/sync_client/orm.py	2017-08-29 09:52:36 +0000
@@ -122,13 +122,9 @@
     WHERE module = 'sd' AND
           model = %s AND
           """+add_sql+"""
-          ("""+field+""" < last_modification OR """+field+""" IS NULL) AND
-          (create_date is NULL or create_date <= NOW())""",
+          ("""+field+""" < last_modification OR """+field+""" IS NULL)
+          """,
                        sql_params)
-        # NOW() is the sql transaction begin date
-        # can't use (sync_date IS NULL or last_modification <= NOW()) bc UTP-1201 use case failed
-        # can't use (last_modification <= NOW()) bc a record created before the sync but updated during the sync will not be sent
-        #                                        and if this record is used in a m2o it will be set to false
             result = [row[0] for row in cr.fetchall()]
         else:
             touched_fields = set(touched_fields)
@@ -138,8 +134,8 @@
     WHERE module = 'sd' AND
           model = %s AND
           """+add_sql+"""
-          ("""+field+""" < last_modification OR """+field+""" IS NULL) AND
-          (create_date is NULL or create_date <= NOW())""",
+          ("""+field+""" < last_modification OR """+field+""" IS NULL) 
+          """,
                        sql_params)
             result = [row[0] for row in cr.fetchall()
                       if row[1] is None \
 
=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2017-08-18 14:46:12 +0000
+++ bin/addons/sync_client/sync_client.py	2017-08-29 09:52:36 +0000
@@ -32,6 +32,7 @@
 import math
 import hashlib
 from psycopg2 import OperationalError
+from psycopg2.extensions import ISOLATION_LEVEL_REPEATABLE_READ, TransactionRollbackError
 
 import logging
 from sync_common import get_md5, check_md5
@@ -637,24 +638,53 @@
         return True
 
     @sync_subprocess('data_push_create')
-    def create_update(self, cr, uid, context=None):
-        context = context or {}
-        updates = self.pool.get(context.get('update_to_send_model', 'sync.client.update_to_send'))
-
-        def prepare_update(session):
-            updates_count = 0
-            for rule_id in self.pool.get('sync.client.rule').search(cr, uid, [('type', '!=', 'USB')], context=context):
-                updates_count += sum(updates.create_update(
-                    cr, uid, rule_id, session, context=context))
-            return updates_count
-
-        entity = self.get_entity(cr, uid, context)
-        session = str(uuid.uuid1())
-        updates_count = prepare_update(session)
-        if updates_count > 0:
-            self.write(cr, uid, [entity.id], {'session_id' : session})
-        return updates_count
-        #state init => update_send
+    def create_update(self, oldcr, uid, context=None):
+        cr = pooler.get_db(oldcr.dbname).cursor()
+        cr._cnx.set_isolation_level(ISOLATION_LEVEL_REPEATABLE_READ)
+        nb_tries = 1
+        MAX_TRIES = 10
+        while True:
+            try:
+                context = context or {}
+                logger = context.get('logger')
+                updates = self.pool.get(context.get('update_to_send_model', 'sync.client.update_to_send'))
+
+                def prepare_update(session):
+                    updates_count = 0
+                    for rule_id in self.pool.get('sync.client.rule').search(cr, uid, [('type', '!=', 'USB')], context=context):
+                        updates_count += sum(updates.create_update(
+                            cr, uid, rule_id, session, context=context))
+                    return updates_count
+
+                entity = self.get_entity(cr, uid, context)
+                session = str(uuid.uuid1())
+                updates_count = prepare_update(session)
+                if updates_count > 0:
+                    self.write(cr, uid, [entity.id], {'session_id' : session})
+                cr.commit()
+                cr.close(True)
+                return updates_count
+            except TransactionRollbackError:
+                cr.rollback()
+                if nb_tries == MAX_TRIES:
+                    msg = _("Unable to generate updates after %d tries") % MAX_TRIES
+                    if logger:
+                        logger.append(msg)
+                        logger.write()
+                    self._logger.info(msg)
+                    cr.close(True)
+                    raise
+                msg = _("Unable to generate updates, retrying %d/%d") % (nb_tries, MAX_TRIES)
+                if logger:
+                    logger.append(msg)
+                    logger.write()
+                self._logger.info(msg)
+                nb_tries += 1
+            except:
+                cr.rollback()
+                cr.close(True)
+                raise
+
 
     @sync_subprocess('data_push_send')
     def send_update(self, cr, uid, context=None):