dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dadaf48
)
Made JobRunner wait for all applicable slaves, not just the main cluster
author
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 21 Oct 2014 21:41:34 +0000
(14:41 -0700)
committer
Ori.livneh
<ori@wikimedia.org>
Wed, 22 Oct 2014 18:46:55 +0000
(18:46 +0000)
Change-Id: Ib610684fd3d9b76ea13fe585a290983c071b88f4
includes/jobqueue/JobRunner.php
patch
|
blob
|
history
diff --git
a/includes/jobqueue/JobRunner.php
b/includes/jobqueue/JobRunner.php
index
4d2c618
..
6b19340
100644
(file)
--- a/
includes/jobqueue/JobRunner.php
+++ b/
includes/jobqueue/JobRunner.php
@@
-186,7
+186,7
@@
class JobRunner {
// other wikis in the farm (on different masters) get a chance.
$timePassed = microtime( true ) - $lastTime;
if ( $timePassed >= 5 || $timePassed < 0 ) {
- if ( !wfWaitForSlaves( $lastTime,
wfWikiID(), false
, 5 ) ) {
+ if ( !wfWaitForSlaves( $lastTime,
false, '*'
, 5 ) ) {
$response['reached'] = 'slave-lag-limit';
break;
}