X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FLocalFile.php;h=a7f6e6f9d25f144c2de1994ad06500f47c2fd451;hb=d4f1e00a0c240a3b725127dcb2779f377a6772dd;hp=c4d421cf11991b944d05833f0f6c6aac02445ddc;hpb=ce2b0bf5a63c5229b3f8f4411754ab9c73906af4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index c4d421cf11..a7f6e6f9d2 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1919,14 +1919,36 @@ class LocalFile extends File {
 		&& strlen( serialize( $this->metadata ) ) <= self::CACHE_FIELD_MAX_LEN;
 	}
 
+	/**
+	 * @return Status
+	 * @since 1.28
+	 */
+	public function acquireFileLock() {
+		return $this->getRepo()->getBackend()->lockFiles(
+			[ $this->getPath() ], LockManager::LOCK_EX, 10
+		);
+	}
+
+	/**
+	 * @return Status
+	 * @since 1.28
+	 */
+	public function releaseFileLock() {
+		return $this->getRepo()->getBackend()->unlockFiles(
+			[ $this->getPath() ], LockManager::LOCK_EX
+		);
+	}
+
 	/**
 	 * Start an atomic DB section and lock the image for update
 	 * or increments a reference counter if the lock is already held
 	 *
+	 * This method should not be used outside of LocalFile/LocalFile*Batch
+	 *
 	 * @throws LocalFileLockError Throws an error if the lock was not acquired
 	 * @return bool Whether the file lock owns/spawned the DB transaction
 	 */
-	function lock() {
+	public function lock() {
 		if ( !$this->locked ) {
 			$logger = LoggerFactory::getInstance( 'LocalFile' );
 
@@ -1936,9 +1958,7 @@ class LocalFile extends File {
 			// Bug 54736: use simple lock to handle when the file does not exist.
 			// SELECT FOR UPDATE prevents changes, not other SELECTs with FOR UPDATE.
 			// Also, that would cause contention on INSERT of similarly named rows.
-			$backend = $this->getRepo()->getBackend();
-			$lockPaths = [ $this->getPath() ]; // represents all versions of the file
-			$status = $backend->lockFiles( $lockPaths, LockManager::LOCK_EX, 10 );
+			$status = $this->acquireFileLock(); // represents all versions of the file
 			if ( !$status->isGood() ) {
 				$dbw->endAtomic( self::ATOMIC_SECTION_LOCK );
 				$logger->warning( "Failed to lock '{file}'", [ 'file' => $this->name ] );
@@ -1947,8 +1967,8 @@ class LocalFile extends File {
 			}
 			// Release the lock *after* commit to avoid row-level contention.
 			// Make sure it triggers on rollback() as well as commit() (T132921).
-			$dbw->onTransactionResolution( function () use ( $backend, $lockPaths, $logger ) {
-				$status = $backend->unlockFiles( $lockPaths, LockManager::LOCK_EX );
+			$dbw->onTransactionResolution( function () use ( $logger ) {
+				$status = $this->releaseFileLock();
 				if ( !$status->isGood() ) {
 					$logger->error( "Failed to unlock '{file}'", [ 'file' => $this->name ] );
 				}
@@ -1965,10 +1985,12 @@ class LocalFile extends File {
 	/**
 	 * Decrement the lock reference count and end the atomic section if it reaches zero
 	 *
+	 * This method should not be used outside of LocalFile/LocalFile*Batch
+	 *
 	 * The commit and loc release will happen when no atomic sections are active, which
 	 * may happen immediately or at some point after calling this
 	 */
-	function unlock() {
+	public function unlock() {
 		if ( $this->locked ) {
 			--$this->locked;
 			if ( !$this->locked ) {