From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 31 Aug 2016 12:24:02 +0000 (-0700)
Subject: Always fail over to sync jobs when Special:RunJobs fails
X-Git-Tag: 1.31.0-rc.0~5818^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=1cce2f77cd430bd783057850a93c911bba8d378e;p=lhc%2Fweb%2Fwiklou.git

Always fail over to sync jobs when Special:RunJobs fails

This makes sure that jobs run one way or another.

Also made a few cleanups and improved the logging.

Change-Id: Ic2916099181ebeb5ae5143d444515db9ed13cee9
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index cded064da6..1add24a600 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -822,16 +822,18 @@ class MediaWiki {
 
 		$runJobsLogger = LoggerFactory::getInstance( 'runJobs' );
 
+		// Fall back to running the job(s) while the user waits if needed
 		if ( !$this->config->get( 'RunJobsAsync' ) ) {
-			// Fall back to running the job here while the user waits
 			$runner = new JobRunner( $runJobsLogger );
-			$runner->run( [ 'maxJobs'  => $n ] );
+			$runner->run( [ 'maxJobs' => $n ] );
 			return;
 		}
 
+		// Do not send request if there are probably no jobs
 		try {
-			if ( !JobQueueGroup::singleton()->queuesHaveJobs( JobQueueGroup::TYPE_DEFAULT ) ) {
-				return; // do not send request if there are probably no jobs
+			$group = JobQueueGroup::singleton();
+			if ( !$group->queuesHaveJobs( JobQueueGroup::TYPE_DEFAULT ) ) {
+				return;
 			}
 		} catch ( JobQueueError $e ) {
 			MWExceptionHandler::logException( $e );
@@ -845,8 +847,7 @@ class MediaWiki {
 
 		$errno = $errstr = null;
 		$info = wfParseUrl( $this->config->get( 'CanonicalServer' ) );
-		MediaWiki\suppressWarnings();
-		$host = $info['host'];
+		$host = $info ? $info['host'] : null;
 		$port = 80;
 		if ( isset( $info['scheme'] ) && $info['scheme'] == 'https' ) {
 			$host = "tls://" . $host;
@@ -855,48 +856,60 @@ class MediaWiki {
 		if ( isset( $info['port'] ) ) {
 			$port = $info['port'];
 		}
-		$sock = fsockopen(
+
+		MediaWiki\suppressWarnings();
+		$sock = $host ? fsockopen(
 			$host,
 			$port,
 			$errno,
 			$errstr,
-			// If it takes more than 100ms to connect to ourselves there
-			// is a problem elsewhere.
-			0.1
-		);
+			// If it takes more than 100ms to connect to ourselves there is a problem...
+			0.100
+		) : false;
 		MediaWiki\restoreWarnings();
-		if ( !$sock ) {
+
+		$invokedWithSuccess = true;
+		if ( $sock ) {
+			$special = SpecialPageFactory::getPage( 'RunJobs' );
+			$url = $special->getPageTitle()->getCanonicalURL( $query );
+			$req = (
+				"POST $url HTTP/1.1\r\n" .
+				"Host: {$info['host']}\r\n" .
+				"Connection: Close\r\n" .
+				"Content-Length: 0\r\n\r\n"
+			);
+
+			$runJobsLogger->info( "Running $n job(s) via '$url'" );
+			// Send a cron API request to be performed in the background.
+			// Give up if this takes too long to send (which should be rare).
+			stream_set_timeout( $sock, 2 );
+			$bytes = fwrite( $sock, $req );
+			if ( $bytes !== strlen( $req ) ) {
+				$invokedWithSuccess = false;
+				$runJobsLogger->error( "Failed to start cron API (socket write error)" );
+			} else {
+				// Do not wait for the response (the script should handle client aborts).
+				// Make sure that we don't close before that script reaches ignore_user_abort().
+				$start = microtime( true );
+				$status = fgets( $sock );
+				$sec = microtime( true ) - $start;
+				if ( !preg_match( '#^HTTP/\d\.\d 202 #', $status ) ) {
+					$invokedWithSuccess = false;
+					$runJobsLogger->error( "Failed to start cron API: received '$status' ($sec)" );
+				}
+			}
+			fclose( $sock );
+		} else {
+			$invokedWithSuccess = false;
 			$runJobsLogger->error( "Failed to start cron API (socket error $errno): $errstr" );
-			// Fall back to running the job here while the user waits
-			$runner = new JobRunner( $runJobsLogger );
-			$runner->run( [ 'maxJobs'  => $n ] );
-			return;
 		}
 
-		$special = SpecialPageFactory::getPage( 'RunJobs' );
-		$url = $special->getPageTitle()->getCanonicalURL( $query );
-		$req = (
-			"POST $url HTTP/1.1\r\n" .
-			"Host: {$info['host']}\r\n" .
-			"Connection: Close\r\n" .
-			"Content-Length: 0\r\n\r\n"
-		);
+		// Fall back to running the job(s) while the user waits if needed
+		if ( !$invokedWithSuccess ) {
+			$runJobsLogger->warning( "Jobs switched to blocking; Special:RunJobs disabled" );
 
-		$runJobsLogger->info( "Running $n job(s) via '$url'" );
-		// Send a cron API request to be performed in the background.
-		// Give up if this takes too long to send (which should be rare).
-		stream_set_timeout( $sock, 2 );
-		$bytes = fwrite( $sock, $req );
-		if ( $bytes !== strlen( $req ) ) {
-			$runJobsLogger->error( "Failed to start cron API (socket write error)" );
-		} else {
-			// Do not wait for the response (the script should handle client aborts).
-			// Make sure that we don't close before that script reaches ignore_user_abort().
-			$status = fgets( $sock );
-			if ( !preg_match( '#^HTTP/\d\.\d 202 #', $status ) ) {
-				$runJobsLogger->error( "Failed to start cron API: received '$status'" );
-			}
+			$runner = new JobRunner( $runJobsLogger );
+			$runner->run( [ 'maxJobs'  => $n ] );
 		}
-		fclose( $sock );
 	}
 }