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

[Laurent Mignon (Acsone)]

Automatically derived from https://code.launchpad.net/~acsone-openerp/openobject-server/7.0-bug-1274997-cron for https://code.launchpad.net/~openerp/openobject-server/7.0. Below is a copy of the original description.

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

[lp:~acsone-openerp/ocb-server/7.0-bug-1274997-cron]

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

Fix log message

[Holger Brunn (Therp) (hbrunn)]

Thanks for this! I think I encountered the same problem once, but instead of fixing it properly, I distributed the calls over the hour, then you work around the problem I guess.

review: Approve (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Given the scenario, the patch looks safe.

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve (code review)

=== 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:36:39 +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()