Pass __METHOD__ to ping query in JobRunner::commitMasterChanges()
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 1 May 2015 21:53:41 +0000 (14:53 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Fri, 1 May 2015 21:53:41 +0000 (14:53 -0700)
Change-Id: I7f79acca0f89a2e07ed2f9eb427e0788c5440ee7

includes/jobqueue/JobRunner.php

index 4d3da8a..0948092 100644 (file)
@@ -452,12 +452,13 @@ class JobRunner implements LoggerAwareInterface {
                        $lb->waitForOne( $pos );
                }
 
+               $fname = __METHOD__;
                // Re-ping all masters with transactions. This throws DBError if some
                // connection died while waiting on locks/slaves, triggering a rollback.
-               wfGetLBFactory()->forEachLB( function( LoadBalancer $lb ) {
-                       $lb->forEachOpenConnection( function( DatabaseBase $conn ) {
+               wfGetLBFactory()->forEachLB( function( LoadBalancer $lb ) use ( $fname ) {
+                       $lb->forEachOpenConnection( function( DatabaseBase $conn ) use ( $fname ) {
                                if ( $conn->writesOrCallbacksPending() ) {
-                                       $conn->query( "SELECT 1" );
+                                       $conn->query( "SELECT 1", $fname );
                                }
                        } );
                } );