jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Prevent duplicate memcached lookups for user record"
......................................................................
Revert "Prevent duplicate memcached lookups for user record"
This reverts commit 7d67b4d9195346e1.
Caused T128246, T128263, T128275.
Change-Id: I639ea59e2d42ffbbf700451074174720f2f45cf4
---
M includes/user/User.php
1 file changed, 5 insertions(+), 11 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/user/User.php b/includes/user/User.php
index c92c06b..7485591 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -468,18 +468,12 @@
}
$cache = ObjectCache::getMainWANInstance();
- $key = $this->getCacheKey( $cache );
-
- $processCache = ObjectCache::getLocalServerInstance( 'hash' );
- $data = $processCache->get( $key );
- if ( !is_array( $data ) ) {
- $data = $cache->get( $key );
- if ( !is_array( $data ) || $data['mVersion'] <
self::VERSION ) {
- // Object is expired
- return false;
- }
- $processCache->set( $key, $data );
+ $data = $cache->get( $this->getCacheKey( $cache ) );
+ if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) {
+ // Object is expired
+ return false;
}
+
wfDebug( "User: got user {$this->mId} from cache\n" );
// Restore from cache
--
To view, visit https://gerrit.wikimedia.org/r/273954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I639ea59e2d42ffbbf700451074174720f2f45cf4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
