upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 19:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Merge pull request #41819 from nextcloud/enh/reconnect-again

Browse source
This commit is contained in:
Julius Härtl 2024-01-12 20:10:19 +01:00 committed by GitHub
commit 39dee92f80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/private/DB/Connection.php
View file

@ -41,6 +41,7 @@ use Doctrine\DBAL\Configuration;
use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Exception\ConnectionLost;
use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform;
@ -78,6 +79,7 @@ class Connection extends PrimaryReadReplicaConnection {
/** @var DbDataCollector|null */
protected $dbDataCollector = null;
private array $lastConnectionCheck = [];
protected ?float $transactionActiveSince = null;
@ -127,10 +129,13 @@ class Connection extends PrimaryReadReplicaConnection {
public function connect($connectionName = null) {
try {
if ($this->_conn) {
$this->reconnectIfNeeded();
/** @psalm-suppress InternalMethod */
return parent::connect();
}
$this->lastConnectionCheck[$this->getConnectionName()] = time();
// Only trigger the event logger for the initial connect call
$eventLogger = \OC::$server->get(IEventLogger::class);
$eventLogger->start('connect:db', 'db connection opened');
@ -679,4 +684,26 @@ class Connection extends PrimaryReadReplicaConnection {
}
return $result;
}
private function reconnectIfNeeded(): void {
if (
!isset($this->lastConnectionCheck[$this->getConnectionName()]) ||
$this->lastConnectionCheck[$this->getConnectionName()] + 30 >= time() ||
$this->isTransactionActive()
) {
return;
}
try {
$this->_conn->query($this->getDriver()->getDatabasePlatform()->getDummySelectSQL());
$this->lastConnectionCheck[$this->getConnectionName()] = time();
} catch (ConnectionLost|\Exception $e) {
$this->logger->warning('Exception during connectivity check, closing and reconnecting', ['exception' => $e]);
$this->close();
}
}
private function getConnectionName(): string {
return $this->isConnectedToPrimary() ? 'primary' : 'replica';
}
}