From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 28 Mar 2018 20:49:21 +0000 (-0700)
Subject: Normalize and lower the default DB lag wait timeout
X-Git-Tag: 1.31.0-rc.0~253^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=7f24eb5d789966ec7c18c0a612fc9089229d4279

Normalize and lower the default DB lag wait timeout

Bug: T190960
Change-Id: I49aca118583b20314e6bf82f196f3413571f5bd9
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 42a6573257..513f59346c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3019,7 +3019,7 @@ function wfWaitForSlaves(
 	$ifWritesSince = null, $wiki = false, $cluster = false, $timeout = null
 ) {
 	if ( $timeout === null ) {
-		$timeout = wfIsCLI() ? 86400 : 10;
+		$timeout = wfIsCLI() ? 60 : 10;
 	}
 
 	if ( $cluster === '*' ) {
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 32886e2f06..bc428ece00 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -313,7 +313,7 @@ abstract class LBFactory implements ILBFactory {
 		$opts += [
 			'domain' => false,
 			'cluster' => false,
-			'timeout' => 60,
+			'timeout' => $this->cliMode ? 60 : 10,
 			'ifWritesSince' => null
 		];