Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 218 insertions, 0 deletions

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
new file mode 100644
index 00000000..db9e764c
--- /dev/null
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * Job queue aggregator code that uses PhpRedis.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Aaron Schulz
+ */
+
+/**
+ * Class to handle tracking information about all queues using PhpRedis
+ *
+ * @ingroup JobQueue
+ * @ingroup Redis
+ * @since 1.21
+ */
+class JobQueueAggregatorRedis extends JobQueueAggregator {
+	/** @var RedisConnectionPool */
+	protected $redisPool;
+
+	/** @var array List of Redis server addresses */
+	protected $servers;
+
+	/**
+	 * @param array $params Possible keys:
+	 *   - redisConfig  : An array of parameters to RedisConnectionPool::__construct().
+	 *   - redisServers : Array of server entries, the first being the primary and the
+	 *                    others being fallback servers. Each entry is either a hostname/port
+	 *                    combination or the absolute path of a UNIX socket.
+	 *                    If a hostname is specified but no port, the standard port number
+	 *                    6379 will be used. Required.
+	 */
+	protected function __construct( array $params ) {
+		parent::__construct( $params );
+		$this->servers = isset( $params['redisServers'] )
+			? $params['redisServers']
+			: array( $params['redisServer'] ); // b/c
+		$params['redisConfig']['serializer'] = 'none';
+		$this->redisPool = RedisConnectionPool::singleton( $params['redisConfig'] );
+	}
+
+	protected function doNotifyQueueEmpty( $wiki, $type ) {
+		$conn = $this->getConnection();
+		if ( !$conn ) {
+			return false;
+		}
+		try {
+			$conn->hDel( $this->getReadyQueueKey(), $this->encQueueName( $type, $wiki ) );
+
+			return true;
+		} catch ( RedisException $e ) {
+			$this->handleException( $conn, $e );
+
+			return false;
+		}
+	}
+
+	protected function doNotifyQueueNonEmpty( $wiki, $type ) {
+		$conn = $this->getConnection();
+		if ( !$conn ) {
+			return false;
+		}
+		try {
+			$conn->multi( Redis::PIPELINE );
+			$conn->hSetNx( $this->getQueueTypesKey(), $type, 'enabled' );
+			$conn->hSet( $this->getReadyQueueKey(), $this->encQueueName( $type, $wiki ), time() );
+			$conn->exec();
+
+			return true;
+		} catch ( RedisException $e ) {
+			$this->handleException( $conn, $e );
+
+			return false;
+		}
+	}
+
+	protected function doGetAllReadyWikiQueues() {
+		$conn = $this->getConnection();
+		if ( !$conn ) {
+			return array();
+		}
+		try {
+			$map = $conn->hGetAll( $this->getReadyQueueKey() );
+
+			if ( is_array( $map ) && isset( $map['_epoch'] ) ) {
+				unset( $map['_epoch'] ); // ignore
+				$pendingDBs = array(); // (type => list of wikis)
+				foreach ( $map as $key => $time ) {
+					list( $type, $wiki ) = $this->dencQueueName( $key );
+					$pendingDBs[$type][] = $wiki;
+				}
+			} else {
+				// Avoid duplicated effort
+				$rand = wfRandomString( 32 );
+				$conn->multi( Redis::MULTI );
+				$conn->setex( "{$rand}:lock", 3600, 1 );
+				$conn->renamenx( "{$rand}:lock", $this->getReadyQueueKey() . ":lock" );
+				if ( $conn->exec() !== array( true, true ) ) { // lock
+					$conn->delete( "{$rand}:lock" );
+					return array(); // already in progress
+				}
+
+				$pendingDBs = $this->findPendingWikiQueues(); // (type => list of wikis)
+
+				$conn->multi( Redis::PIPELINE );
+				$now = time();
+				$map = array( '_epoch' => time() ); // dummy key for empty Redis collections
+				foreach ( $pendingDBs as $type => $wikis ) {
+					$conn->hSetNx( $this->getQueueTypesKey(), $type, 'enabled' );
+					foreach ( $wikis as $wiki ) {
+						$map[$this->encQueueName( $type, $wiki )] = $now;
+					}
+				}
+				$conn->hMSet( $this->getReadyQueueKey(), $map );
+				$conn->exec();
+
+				$conn->delete( $this->getReadyQueueKey() . ":lock" ); // unlock
+			}
+
+			return $pendingDBs;
+		} catch ( RedisException $e ) {
+			$this->handleException( $conn, $e );
+
+			return array();
+		}
+	}
+
+	protected function doPurge() {
+		$conn = $this->getConnection();
+		if ( !$conn ) {
+			return false;
+		}
+		try {
+			$conn->delete( $this->getReadyQueueKey() );
+			// leave key at getQueueTypesKey() alone
+		} catch ( RedisException $e ) {
+			$this->handleException( $conn, $e );
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get a connection to the server that handles all sub-queues for this queue
+	 *
+	 * @return RedisConnRef|bool Returns false on failure
+	 * @throws MWException
+	 */
+	protected function getConnection() {
+		$conn = false;
+		foreach ( $this->servers as $server ) {
+			$conn = $this->redisPool->getConnection( $server );
+			if ( $conn ) {
+				break;
+			}
+		}
+
+		return $conn;
+	}
+
+	/**
+	 * @param RedisConnRef $conn
+	 * @param RedisException $e
+	 * @return void
+	 */
+	protected function handleException( RedisConnRef $conn, $e ) {
+		$this->redisPool->handleError( $conn, $e );
+	}
+
+	/**
+	 * @return string
+	 */
+	private function getReadyQueueKey() {
+		return "jobqueue:aggregator:h-ready-queues:v2"; // global
+	}
+
+	/**
+	 * @return string
+	 */
+	private function getQueueTypesKey() {
+		return "jobqueue:aggregator:h-queue-types:v2"; // global
+	}
+
+	/**
+	 * @param string $type
+	 * @param string $wiki
+	 * @return string
+	 */
+	private function encQueueName( $type, $wiki ) {
+		return rawurlencode( $type ) . '/' . rawurlencode( $wiki );
+	}
+
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	private function dencQueueName( $name ) {
+		list( $type, $wiki ) = explode( '/', $name, 2 );
+
+		return array( rawurldecode( $type ), rawurldecode( $wiki ) );
+	}
+}