From a6f2310cc7cf2027c8fb183bfdcd4effd36bba6f Mon Sep 17 00:00:00 2001 From: Gilles Dubuc Date: Mon, 17 Nov 2014 19:05:52 +0100 Subject: [PATCH] filebackend: Log more details about backend-fail-internal errors Bug: 73094 Change-Id: I9e45284e3cfd55bc34d87009387a2c1766e2db4a Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/991 --- includes/filebackend/FileBackendMultiWrite.php | 4 ++++ includes/filebackend/SwiftFileBackend.php | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php index bfffcc0f2a..8b6eaca20c 100644 --- a/includes/filebackend/FileBackendMultiWrite.php +++ b/includes/filebackend/FileBackendMultiWrite.php @@ -314,6 +314,8 @@ class FileBackendMultiWrite extends FileBackend { $mStat = $mBackend->getFileStat( array( 'src' => $mPath, 'latest' => true ) ); if ( $mStat === null || ( $mSha1 !== false && !$mStat ) ) { // sanity $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'FileOperation', __METHOD__ + . ': File is not available on the master backend' ); continue; // file is not available on the master backend... } // Check of all clone backends agree with the master... @@ -326,6 +328,8 @@ class FileBackendMultiWrite extends FileBackend { $cStat = $cBackend->getFileStat( array( 'src' => $cPath, 'latest' => true ) ); if ( $cStat === null || ( $cSha1 !== false && !$cStat ) ) { // sanity $status->fatal( 'backend-fail-internal', $cBackend->getName() ); + wfDebugLog( 'FileOperation', __METHOD__ + . ': File is not available on the clone backend' ); continue; // file is not available on the clone backend... } if ( $mSha1 === $cSha1 ) { diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php index 625b9b40ed..7234474081 100644 --- a/includes/filebackend/SwiftFileBackend.php +++ b/includes/filebackend/SwiftFileBackend.php @@ -537,6 +537,7 @@ class SwiftFileBackend extends FileBackendStore { return $status; // already there } elseif ( $stat === null ) { $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get container stat' ); return $status; } @@ -568,6 +569,7 @@ class SwiftFileBackend extends FileBackendStore { $status->fatal( 'backend-fail-usable', $params['dir'] ); } else { $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get container stat' ); } return $status; @@ -588,6 +590,7 @@ class SwiftFileBackend extends FileBackendStore { $status->fatal( 'backend-fail-usable', $params['dir'] ); } else { $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get container stat' ); } return $status; @@ -607,6 +610,7 @@ class SwiftFileBackend extends FileBackendStore { return $status; // ok, nothing to do } elseif ( !is_array( $stat ) ) { $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'SwiftBackend', __METHOD__ . ': cannot get container stat' ); return $status; } @@ -1253,6 +1257,7 @@ class SwiftFileBackend extends FileBackendStore { if ( $rcode != 204 && $rcode !== 202 ) { $status->fatal( 'backend-fail-internal', $this->name ); + wfDebugLog( 'SwiftBackend', __METHOD__ . ': unexpected rcode value (' . $rcode . ')' ); } return $status; -- 2.20.1