From feb03ba80a85538ecabcbd908b930dda2d460bd6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 7 Oct 2015 11:06:55 -0700 Subject: [PATCH] Convert updateChunkStatus to using a flush commit() This will at least warn if an explicit transaction from a caller via begin() is active Change-Id: Id4198cb35368c0d92cf8abfde46c75ea09fd8f96 --- includes/upload/UploadFromChunks.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php index cc9f5c85fc..fe8b949235 100644 --- a/includes/upload/UploadFromChunks.php +++ b/includes/upload/UploadFromChunks.php @@ -237,7 +237,6 @@ class UploadFromChunks extends UploadFromFile { $dbw = $this->repo->getMasterDb(); // Use a quick transaction since we will upload the full temp file into shared // storage, which takes time for large files. We don't want to hold locks then. - $dbw->begin( __METHOD__ ); $dbw->update( 'uploadstash', array( @@ -248,7 +247,7 @@ class UploadFromChunks extends UploadFromFile { array( 'us_key' => $this->mFileKey ), __METHOD__ ); - $dbw->commit( __METHOD__ ); + $dbw->commit( __METHOD__, 'flush' ); } /** -- 2.20.1