[MediaWiki-commits] [Gerrit] Defer DatabaseMessageIndex unlock() action to post-commit - change (mediawiki...Translate)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/281796

Change subject: Defer DatabaseMessageIndex unlock() action to post-commit
......................................................................

Defer DatabaseMessageIndex unlock() action to post-commit

Change-Id: I113990b01bfcba50614d2d9e2d4ff5afe3ef3719
---
M utils/MessageIndex.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/96/281796/1

diff --git a/utils/MessageIndex.php b/utils/MessageIndex.php
index 3a650ae..53b76f6 100644
--- a/utils/MessageIndex.php
+++ b/utils/MessageIndex.php
@@ -409,8 +409,12 @@
 
        protected function unlock() {
                $db = wfGetDB( DB_MASTER );
+               // Unlock once the rows are actually unlocked to avoid deadlocks
+               $db->onTransactionIdle( function () use ( $db ) {
+                       $db->unlock( 'translate-messageindex', __METHOD__ );
+               } );
 
-               return $db->unlock( 'translate-messageindex', __METHOD__ );
+               return true;
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/281796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I113990b01bfcba50614d2d9e2d4ff5afe3ef3719
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits