From ea37a9b65d4b4040f0ffedafa3d2813ebef28a90 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 29 Mar 2018 14:51:47 -0700 Subject: [PATCH] rdbms: remove some dead code from Database::begin The "since" filed is computed after getLag(), so this was useless Change-Id: I252602e85709b1cfc191d4783bd1c53d5b3e8fe8 --- includes/libs/rdbms/database/Database.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 00d9b0b33d..523f7cd462 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -3392,10 +3392,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware $this->trxWriteAdjQueryCount = 0; $this->trxWriteCallers = []; // First SELECT after BEGIN will establish the snapshot in REPEATABLE-READ. - // Get an estimate of the replica DB lag before then, treating estimate staleness - // as lag itself just to be safe - $status = $this->getApproximateLagStatus(); - $this->trxReplicaLag = $status['lag'] + ( microtime( true ) - $status['since'] ); + // Get an estimate of the replication lag before any such queries. + $this->trxReplicaLag = $this->getApproximateLagStatus()['lag']; // T147697: make explicitTrxActive() return true until begin() finishes. This way, no // caller will think its OK to muck around with the transaction just because startAtomic() // has not yet completed (e.g. setting trxAtomicLevels). -- 2.20.1