From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 9 Aug 2019 00:46:14 +0000 (-0700)
Subject: rdbms: make LBFactory close/rollback dangling handles like LoadBalancer
X-Git-Tag: 1.34.0-rc.0~596^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=c3900f9f8ae920af79ddad588b68a49b9e11df19;p=lhc%2Fweb%2Fwiklou.git

rdbms: make LBFactory close/rollback dangling handles like LoadBalancer

The application is expected to call shutdown(), so do not commit if that
never happens, which usually indicates some sort of severe error. This
should avoid "already closed" errors that pile on top of uncaught errors.

Bug: T225103
Bug: T230065
Change-Id: I1bdfe87c47bcc2537d0dfc518f7212c2c9bf21d2
---

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 4426654ca2..77467f062a 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -160,7 +160,6 @@ abstract class LBFactory implements ILBFactory {
 	}
 
 	public function destroy() {
-		$this->shutdown( self::SHUTDOWN_NO_CHRONPROT );
 		$this->forEachLBCallMethod( 'disable' );
 	}