L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-67486-swap-cron-lock-MOODLE_38_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_38_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2020-01-15 13:53:56 +08:00
parent b5410980aa 8e725dd819
commit 712b21c6e7
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/task/manager.php
+14 -12
View File
@@ -484,10 +484,6 @@ class manager {
global $DB;
$cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
throw new \moodle_exception('locktimeout');
}
$where = '(nextruntime IS NULL OR nextruntime < :timestart1)';
$params = array('timestart1' => $timestart);
$records = $DB->get_records_select('task_adhoc', $where, $params);
@@ -511,6 +507,13 @@ class manager {
continue;
}
// The global cron lock is under the most contention so request it
// as late as possible and release it as soon as possible.
if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
$lock->release();
throw new \moodle_exception('locktimeout');
}
$task->set_lock($lock);
if (!$task->is_blocking()) {
$cronlock->release();
@@ -521,8 +524,6 @@ class manager {
}
}
// No tasks.
$cronlock->release();
return null;
}
@@ -539,10 +540,6 @@ class manager {
global $DB;
$cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
throw new \moodle_exception('locktimeout');
}
$where = "(lastruntime IS NULL OR lastruntime < :timestart1)
AND (nextruntime IS NULL OR nextruntime < :timestart2)
AND disabled = 0
@@ -581,6 +578,13 @@ class manager {
continue;
}
// The global cron lock is under the most contention so request it
// as late as possible and release it as soon as possible.
if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
$lock->release();
throw new \moodle_exception('locktimeout');
}
if (!$task->is_blocking()) {
$cronlock->release();
} else {
@@ -590,8 +594,6 @@ class manager {
}
}
// No tasks.
$cronlock->release();
return null;
}