From 5eed0371853dee728420144166933ad5595292c5 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 19 Jun 2019 03:19:53 +0100 Subject: [PATCH] rdbms: mention wait time in LoadBalancer::safeWaitForMasterPos() error logging Change-Id: I134e58949bab25e73874ea29d1b306e4fffa6ef9 --- includes/libs/rdbms/loadbalancer/LoadBalancer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index ffb7a347b2..4787edc5b4 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -1961,12 +1961,15 @@ class LoadBalancer implements ILoadBalancer { } if ( $pos instanceof DBMasterPos ) { + $start = microtime( true ); $result = $conn->masterPosWait( $pos, $timeout ); + $seconds = max( microtime( true ) - $start, 0 ); if ( $result == -1 || is_null( $result ) ) { - $msg = __METHOD__ . ': timed out waiting on {host} pos {pos}'; + $msg = __METHOD__ . ': timed out waiting on {host} pos {pos} [{seconds}s]'; $this->replLogger->warning( $msg, [ 'host' => $conn->getServer(), 'pos' => $pos, + 'seconds' => round( $seconds, 6 ), 'trace' => ( new RuntimeException() )->getTraceAsString() ] ); $ok = false; -- 2.20.1