Merge lp:~acsone-openerp/openobject-server/7.0-bug-1274997-cron into lp:openobject-server/7.0

[Laurent Mignon (Acsone)]

solve lp:1274997
use the same search criteria as when listing job to excecute when acquiring the lock on the job before its execution to prevent running already executed job when the cron is running in multi thread

[Laurent Mignon (Acsone) (lmi)]

Change status from 'Merged' to 'Needs review' since the fix has only been applied on trunk but not on the 7.0 branch.

review: Needs Resubmitting

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Laurent you should change your vote as "Resubmit" means it can't be merge now and you must submit it again later.

[Laurent Mignon (Acsone) (lmi)]

review: Approve

Unmerged revisions

5218. By Laurent Mignon (Acsone) on 2014-02-05

Fix log message

5217. By Laurent Mignon (Acsone) on 2014-01-31

[FIX] ir_cron: use the same search criteria as when listing job to excecyte when acquiring the lock on the job before its execution to prevent running already executed job

=== modified file 'openerp/addons/base/ir/ir_cron.py'
--- openerp/addons/base/ir/ir_cron.py	2013-04-18 01:04:10 +0000
+++ openerp/addons/base/ir/ir_cron.py	2014-02-05 09:15:26 +0000
@@ -216,12 +216,21 @@
             lock_cr = db.cursor()
             try:
                 # Try to grab an exclusive lock on the job row from within the task transaction
+                # Restrict to the same conditions as for the search since the job may have already
+                # been run by an other thread when cron is running in multi thread
                 lock_cr.execute("""SELECT *
                                    FROM ir_cron
-                                   WHERE id=%s
+                                   WHERE numbercall != 0
+                                      AND active
+                                      AND nextcall <= (now() at time zone 'UTC')
+                                      AND id=%s
                                    FOR UPDATE NOWAIT""",
                                (job['id'],), log_exceptions=False)
 
+                locked_job = lock_cr.fetchone()
+                if not locked_job:
+                    _logger.debug("Job `%s` already executed by another process/thread. skipping it", job['name'])
+                    continue
                 # Got the lock on the job row, run its code
                 _logger.debug('Starting job `%s`.', job['name'])
                 job_cr = db.cursor()