Actually update $lastTime in runJobs.php
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 22 May 2013 23:26:46 +0000 (16:26 -0700)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 May 2013 18:09:45 +0000 (18:09 +0000)
Change-Id: Ic51b0941aa72f444b1bad919e6a05ff0ba273ce7

maintenance/runJobs.php

index 0f4c184..6a6f9d2 100644 (file)
@@ -84,7 +84,7 @@ class RunJobs extends Maintenance {
                }
 
                $flags = JobQueueGroup::USE_CACHE | JobQueueGroup::USE_PRIORITY;
-               $lastTime = time();
+               $lastTime = time(); // time since last slave check
                do {
                        $job = ( $type === false )
                                ? $group->pop( JobQueueGroup::TYPE_DEFAULT, $flags )
@@ -129,6 +129,7 @@ class RunJobs extends Maintenance {
                                $timePassed = time() - $lastTime;
                                if ( $timePassed >= 5 || $timePassed < 0 ) {
                                        wfWaitForSlaves();
+                                       $lastTime = time();
                                }
                                // Don't let any queue slaves/backups fall behind
                                if ( $jobsRun > 0 && ( $jobsRun % 100 ) == 0 ) {