From 729a258ff82a8a3d518749861d1cadb7d5b843b3 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 20 Jul 2016 22:05:59 -0700
Subject: [PATCH] Add missing file locks to deleteArchivedFiles.php

Change-Id: I512ce5a1a4f00039fbe26f1c5cd1aec655eea263
---
 maintenance/deleteArchivedFiles.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php
index d07a8d4c75..af05a81dee 100644
--- a/maintenance/deleteArchivedFiles.php
+++ b/maintenance/deleteArchivedFiles.php
@@ -54,7 +54,7 @@ class DeleteArchivedFiles extends Maintenance {
 		$this->output( "Searching for and deleting archived files...\n" );
 		$res = $dbw->select(
 			'filearchive',
-			[ 'fa_id', 'fa_storage_group', 'fa_storage_key', 'fa_sha1' ],
+			[ 'fa_id', 'fa_storage_group', 'fa_storage_key', 'fa_sha1', 'fa_name' ],
 			'',
 			__METHOD__
 		);
@@ -67,9 +67,19 @@ class DeleteArchivedFiles extends Maintenance {
 				continue;
 			}
 
+			/** @var LocalFile $file */
+			$file = $repo->newFile( $row->fa_name );
+			try {
+				$file->lock();
+			} catch ( LocalFileLockError $e ) {
+				$this->error( "Could not acquire lock on '{$row->fa_name}', skipping\n" );
+				continue;
+			}
+
 			$group = $row->fa_storage_group;
 			$id = $row->fa_id;
-			$path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
+			$path = $repo->getZonePath( 'deleted' ) .
+				'/' . $repo->getDeletedHashPath( $key ) . $key;
 			if ( isset( $row->fa_sha1 ) ) {
 				$sha1 = $row->fa_sha1;
 			} else {
@@ -96,6 +106,7 @@ class DeleteArchivedFiles extends Maintenance {
 				$this->output( "Notice - file '$key' is still in use\n" );
 			} elseif ( !$repo->quickPurge( $path ) ) {
 				$this->output( "Unable to remove file $path, skipping\n" );
+				$file->unlock();
 				continue; // don't delete even with --force
 			} else {
 				$needForce = false;
@@ -105,12 +116,14 @@ class DeleteArchivedFiles extends Maintenance {
 				if ( $this->hasOption( 'force' ) ) {
 					$this->output( "Got --force, deleting DB entry\n" );
 				} else {
+					$file->unlock();
 					continue;
 				}
 			}
 
 			$count++;
 			$dbw->delete( 'filearchive', [ 'fa_id' => $id ], __METHOD__ );
+			$file->unlock();
 		}
 
 		$this->commitTransaction( $dbw, __METHOD__ );
-- 
2.20.1