X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcopyFileBackend.php;h=2363d40ae3eb095cab486db8026ea1e17571d237;hb=29719f846b8887e1190ddf85125387c079f9539b;hp=78ffb202056f764d2aeed485d7ed1cc7648c2bb8;hpb=3e92dfbd2f0d12327aab3261b1b010eb06f932a9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php
index 78ffb20205..2363d40ae3 100644
--- a/maintenance/copyFileBackend.php
+++ b/maintenance/copyFileBackend.php
@@ -42,7 +42,10 @@ class CopyFileBackend extends Maintenance {
 		$this->addOption( 'dst', 'Backend where files should be copied to', true, true );
 		$this->addOption( 'containers', 'Pipe separated list of containers', true, true );
 		$this->addOption( 'subdir', 'Only do items in this child directory', false, true );
-		$this->addOption( 'ratefile', 'File to check periodically for batch size.', false, true );
+		$this->addOption( 'ratefile', 'File to check periodically for batch size', false, true );
+		$this->addOption( 'skiphash', 'Skip SHA-1 sync checks for files' );
+		$this->addOption( 'missingonly', 'Only copy files missing from destination listing' );
+		$this->addOption( 'utf8only', 'Skip source files that do not have valid UTF-8 names' );
 		$this->setBatchSize( 50 );
 	}
 
@@ -54,6 +57,10 @@ class CopyFileBackend extends Maintenance {
 
 		$rateFile = $this->getOption( 'ratefile' );
 
+		if ( $this->hasOption( 'utf8only' ) && !extension_loaded( 'mbstring' ) ) {
+			$this->error( "Cannot check for UTF-8, mbstring extension missing.", 1 ); // die
+		}
+
 		$count = 0;
 		foreach ( $containers as $container ) {
 			if ( $subDir != '' ) {
@@ -64,12 +71,34 @@ class CopyFileBackend extends Maintenance {
 				$this->output( "Doing container '$container'...\n" );
 			}
 
-			$dir = $src->getRootStoragePath() . "/$backendRel";
-			$srcPathsRel = $src->getFileList( array( 'dir' => $dir ) );
+			$srcPathsRel = $src->getFileList( array(
+				'dir' => $src->getRootStoragePath() . "/$backendRel" ) );
 			if ( $srcPathsRel === null ) {
 				$this->error( "Could not list files in $container.", 1 ); // die
 			}
 
+			// Do a listing comparison if specified
+			if ( $this->hasOption( 'missingonly' ) ) {
+				$relFilesSrc = array();
+				$relFilesDst = array();
+				foreach ( $srcPathsRel as $srcPathRel ) {
+					$relFilesSrc[] = $srcPathRel;
+				}
+				$dstPathsRel = $dst->getFileList( array(
+					'dir' => $dst->getRootStoragePath() . "/$backendRel" ) );
+				if ( $dstPathsRel === null ) {
+					$this->error( "Could not list files in $container.", 1 ); // die
+				}
+				foreach ( $dstPathsRel as $dstPathRel ) {
+					$relFilesDst[] = $dstPathRel;
+				}
+				// Only copy the missing files over in the next loop
+				$srcPathsRel = array_diff( $relFilesSrc, $relFilesDst );
+				$this->output( count( $srcPathsRel ) . " file(s) need to be copied.\n" );
+				unset( $relFilesSrc );
+				unset( $relFilesDst );
+			}
+
 			$batchPaths = array();
 			foreach ( $srcPathsRel as $srcPathRel ) {
 				// Check up on the rate file periodically to adjust the concurrency
@@ -104,10 +133,14 @@ class CopyFileBackend extends Maintenance {
 	) {
 		$ops = array();
 		$fsFiles = array();
+		$copiedRel = array(); // for output message
 		foreach ( $srcPathsRel as $srcPathRel ) {
 			$srcPath = $src->getRootStoragePath() . "/$backendRel/$srcPathRel";
 			$dstPath = $dst->getRootStoragePath() . "/$backendRel/$srcPathRel";
-			if ( $this->filesAreSame( $src, $dst, $srcPath, $dstPath ) ) {
+			if ( $this->hasOption( 'utf8only' ) && !mb_check_encoding( $srcPath, 'UTF-8' ) ) {
+				$this->error( "Detected illegal (non-UTF8) path for $srcPath." );
+				continue;
+			} elseif ( $this->filesAreSame( $src, $dst, $srcPath, $dstPath ) ) {
 				$this->output( "Already have $srcPathRel.\n" );
 				continue; // assume already copied...
 			}
@@ -115,36 +148,51 @@ class CopyFileBackend extends Maintenance {
 			$fsFile = $src->getLocalReference( array( 'src' => $srcPath, 'latest' => 1 ) );
 			if ( !$fsFile ) {
 				$this->error( "Could not get local copy of $srcPath.", 1 ); // die
+			} elseif ( !$fsFile->exists() ) {
+				// FSFileBackends just return the path for getLocalReference() and paths with
+				// illegal slashes may get normalized to a different path. This can cause the
+				// local reference to not exist...skip these broken files.
+				$this->error( "Detected possible illegal path for $srcPath." );
+				continue;
 			}
 			$fsFiles[] = $fsFile; // keep TempFSFile objects alive as needed
 			// Note: prepare() is usually fast for key/value backends
-			$status = $dst->prepare( array( 'dir' => dirname( $dstPath ) ) );
+			$status = $dst->prepare( array( 'dir' => dirname( $dstPath ), 'bypassReadOnly' => 1 ) );
 			if ( !$status->isOK() ) {
 				$this->error( print_r( $status->getErrorsArray(), true ) );
 				$this->error( "Could not copy $srcPath to $dstPath.", 1 ); // die
 			}
 			$ops[] = array( 'op' => 'store',
 				'src' => $fsFile->getPath(), 'dst' => $dstPath, 'overwrite' => 1 );
+			$copiedRel[] = $srcPathRel;
 		}
 
-		$status = $dst->doOperations( $ops, array( 'nonJournaled' => 1 ) );
+		$t_start = microtime( true );
+		$status = $dst->doQuickOperations( $ops, array( 'bypassReadOnly' => 1 ) );
+		if ( !$status->isOK() ) {
+			sleep( 10 ); // wait and retry copy again
+			$status = $dst->doQuickOperations( $ops, array( 'bypassReadOnly' => 1 ) );
+		}
+		$ellapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
 		if ( !$status->isOK() ) {
 			$this->error( print_r( $status->getErrorsArray(), true ) );
 			$this->error( "Could not copy file batch.", 1 ); // die
-		} else {
-			$this->output( "Copied these file(s):\n" . implode( "\n", $srcPathsRel ) . "\n\n" );
+		} elseif ( count( $copiedRel ) ) {
+			$this->output( "\nCopied these file(s) [{$ellapsed_ms}ms]:\n" .
+				implode( "\n", $copiedRel ) . "\n\n" );
 		}
 	}
 
 	protected function filesAreSame( FileBackend $src, FileBackend $dst, $sPath, $dPath ) {
+		$skipHash = $this->hasOption( 'skiphash' );
 		return (
 			( $src->fileExists( array( 'src' => $sPath, 'latest' => 1 ) )
 				=== $dst->fileExists( array( 'src' => $dPath, 'latest' => 1 ) ) // short-circuit
 			) && ( $src->getFileSize( array( 'src' => $sPath, 'latest' => 1 ) )
 				=== $dst->getFileSize( array( 'src' => $dPath, 'latest' => 1 ) ) // short-circuit
-			) && ( $src->getFileSha1Base36( array( 'src' => $sPath, 'latest' => 1 ) )
+			) && ( $skipHash || ( $src->getFileSha1Base36( array( 'src' => $sPath, 'latest' => 1 ) )
 				=== $dst->getFileSha1Base36( array( 'src' => $dPath, 'latest' => 1 ) )
-			)
+			) )
 		);
 	}
 }