Avoid pointless DB_MASTER connections in User::clearSharedCache()

Change-Id: Ifc4f489cea4460185cb2d8317f174cabd67f5862

diff --git a/includes/user/User.php b/includes/user/User.php
index 97035c2..eeade49 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -2509,12 +2509,17 @@ class User implements IDBAccessObject, UserIdentity {
                if ( $mode === 'refresh' ) {
                        $cache->delete( $key, 1 );
                } else {
-                       wfGetDB( DB_MASTER )->onTransactionPreCommitOrIdle(
-                               function () use ( $cache, $key ) {
-                                       $cache->delete( $key );
-                               },
-                               __METHOD__
-                       );
+                       $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
+                       if ( $lb->hasOrMadeRecentMasterChanges() ) {
+                               $lb->getConnection( DB_MASTER )->onTransactionPreCommitOrIdle(
+                                       function () use ( $cache, $key ) {
+                                               $cache->delete( $key );
+                                       },
+                                       __METHOD__
+                               );
+                       } else {
+                               $cache->delete( $key );
+                       }
                }
        }