From 92412c166bbbb293a9968588e5e21f9c803b1904 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 27 Jul 2019 05:08:06 -0400 Subject: [PATCH] externalstore: use CONN_TRX_AUTOCOMMIT instead of IDatabase::clearFlag() Change-Id: I8984623d3ff67d305597f05c596c2777c2c117e0 --- includes/externalstore/ExternalStoreDB.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php index 4d70d66f10..4db351b25b 100644 --- a/includes/externalstore/ExternalStoreDB.php +++ b/includes/externalstore/ExternalStoreDB.php @@ -154,12 +154,13 @@ class ExternalStoreDB extends ExternalStoreMedium { */ public function getSlave( $cluster ) { $lb = $this->getLoadBalancer( $cluster ); - $domainId = $this->getDomainId( $lb->getServerInfo( $lb->getWriterIndex() ) ); - - $db = $lb->getConnectionRef( DB_REPLICA, [], $domainId ); - $db->clearFlag( DBO_TRX ); // sanity - return $db; + return $lb->getConnectionRef( + DB_REPLICA, + [], + $this->getDomainId( $lb->getServerInfo( $lb->getWriterIndex() ) ), + $lb::CONN_TRX_AUTOCOMMIT + ); } /** @@ -170,12 +171,13 @@ class ExternalStoreDB extends ExternalStoreMedium { */ public function getMaster( $cluster ) { $lb = $this->getLoadBalancer( $cluster ); - $domainId = $this->getDomainId( $lb->getServerInfo( $lb->getWriterIndex() ) ); - - $db = $lb->getMaintenanceConnectionRef( DB_MASTER, [], $domainId ); - $db->clearFlag( DBO_TRX ); // sanity - return $db; + return $lb->getMaintenanceConnectionRef( + DB_MASTER, + [], + $this->getDomainId( $lb->getServerInfo( $lb->getWriterIndex() ) ), + $lb::CONN_TRX_AUTOCOMMIT + ); } /** -- 2.20.1