Revert r85785

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8d87847..1f537f8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -238,7 +238,6 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout
   exceeded;"
 * (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
-* (bug 13921) deadlocks mass-deleting media files in categories
 
  === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/Article.php b/includes/Article.php
index e70b7b8..a52b613 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -4420,11 +4420,7 @@ class Article {
         */
        public function updateCategoryCounts( $added, $deleted ) {
                $ns = $this->mTitle->getNamespace();
-
-               // https://bugzilla.wikimedia.org/show_bug.cgi?id=13921
-               // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-               $lb = wfGetLBFactory()->newMainLB();
-               $dbw = $lb->getConnection( DB_MASTER );
+               $dbw = wfGetDB( DB_MASTER );
 
                # First make sure the rows exist.  If one of the "deleted" ones didn't
                # exist, we might legitimately not create it, but it's simpler to just
@@ -4476,9 +4472,6 @@ class Article {
                                __METHOD__
                        );
                }
-
-               $lb->commitMasterChanges();
-               $lb->closeAll();
        }
 
        /**

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index de4f758..1f9184a 100644 (file)
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1508,13 +1508,9 @@ class LocalFileDeleteBatch {
        }
 
        function doDBDeletes() {
+               $dbw = $this->file->repo->getMasterDB();
                list( $oldRels, $deleteCurrent ) = $this->getOldRels();
 
-               // https://bugzilla.wikimedia.org/show_bug.cgi?id=13921
-               // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-               $lb = wfGetLBFactory()->newMainLB();
-               $dbw = $lb->getConnection( DB_MASTER );
-
                if ( count( $oldRels ) ) {
                        $dbw->delete( 'oldimage',
                                array(
@@ -1526,9 +1522,6 @@ class LocalFileDeleteBatch {
                if ( $deleteCurrent ) {
                        $dbw->delete( 'image', array( 'img_name' => $this->file->getName() ), __METHOD__ );
                }
-
-               $lb->commitMasterChanges();
-               $lb->closeAll();
        }
 
        /**