From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 12 Nov 2013 23:23:01 +0000 (-0800)
Subject: Avoid HEAD requests for files missing from the destination
X-Git-Tag: 1.31.0-rc.0~18155^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=30d115c4aec9af7dbc26478ebb3d9b93e32d3533;p=lhc%2Fweb%2Fwiklou.git

Avoid HEAD requests for files missing from the destination

Change-Id: I8a3d2ddeb650c800d1e4af144d5cd2cb23cd8744
---

diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php
index 21ef4ffa0a..49af0b89a8 100644
--- a/maintenance/copyFileBackend.php
+++ b/maintenance/copyFileBackend.php
@@ -35,7 +35,8 @@ require_once __DIR__ . '/Maintenance.php';
  * @ingroup Maintenance
  */
 class CopyFileBackend extends Maintenance {
-	protected $statCache = array();
+	/** @var Array|null (path sha1 => stat) Pre-computed dst stat entries from listings */
+	protected $statCache = null;
 
 	public function __construct() {
 		parent::__construct();
@@ -98,7 +99,7 @@ class CopyFileBackend extends Maintenance {
 				if ( $dstPathsRel === null ) {
 					$this->error( "Could not list files in $container.", 1 ); // die
 				}
-				$this->statCache = array(); // clear
+				$this->statCache = array();
 				foreach ( $dstPathsRel as $dstPathRel ) {
 					$path = $dst->getRootStoragePath() . "/$backendRel/$dstPathRel";
 					$this->statCache[sha1( $path )] = $dst->getFileStat( array( 'src' => $path ) );
@@ -338,9 +339,14 @@ class CopyFileBackend extends Maintenance {
 		$skipHash = $this->hasOption( 'skiphash' );
 		$srcStat = $src->getFileStat( array( 'src' => $sPath ) );
 		$dPathSha1 = sha1( $dPath );
-		$dstStat = isset( $this->statCache[$dPathSha1] )
-			? $this->statCache[$dPathSha1]
-			: $dst->getFileStat( array( 'src' => $dPath ) );
+		if ( $this->statCache !== null ) {
+			// All dst files are already in stat cache
+			$dstStat = isset( $this->statCache[$dPathSha1] )
+				? $this->statCache[$dPathSha1]
+				: false;
+		} else {
+			$dstStat = $dst->getFileStat( array( 'src' => $dPath ) );
+		}
 		return (
 			is_array( $srcStat ) // sanity check that source exists
 			&& is_array( $dstStat ) // dest exists