From fa07f92527048ae477da6f859924248702375c46 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 1 May 2015 14:53:41 -0700 Subject: [PATCH] Pass __METHOD__ to ping query in JobRunner::commitMasterChanges() Change-Id: I7f79acca0f89a2e07ed2f9eb427e0788c5440ee7 --- includes/jobqueue/JobRunner.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php index 4d3da8a555..0948092e67 100644 --- a/includes/jobqueue/JobRunner.php +++ b/includes/jobqueue/JobRunner.php @@ -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 ); } } ); } ); -- 2.20.1