From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 9 Sep 2015 00:02:39 +0000 (-0700)
Subject: Removed clearSharedCache() hack in User.php
X-Git-Tag: 1.31.0-rc.0~10025^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=d30ada2ad135b95d134c66f0fe197260df71f136;p=lhc%2Fweb%2Fwiklou.git

Removed clearSharedCache() hack in User.php

* WAN cache key salting/tombstones makes this overkill now

Change-Id: I078daacc5d2987858d720677f11e9828d71021e2
---

diff --git a/includes/User.php b/includes/User.php
index 605dab6834..dbcbe31fce 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3709,14 +3709,6 @@ class User implements IDBAccessObject {
 		Hooks::run( 'UserSaveSettings', array( $this ) );
 		$this->clearSharedCache();
 		$this->getUserPage()->invalidateCache();
-
-		// T95839: clear the cache again post-commit to reduce race conditions
-		// where stale values are written back to the cache by other threads.
-		// Note: this *still* doesn't deal with REPEATABLE-READ snapshot lag...
-		$that = $this;
-		$dbw->onTransactionIdle( function() use ( $that ) {
-			$that->clearSharedCache();
-		} );
 	}
 
 	/**