diff options
| author | Louis Chemineau <louis@chmn.me> | 2025-02-18 15:49:36 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-02-25 11:08:43 +0000 |
| commit | f9a4e80a7245bcaa4d6268793bea23c521cb73bc (patch) | |
| tree | bcbf41b482a38fe5c56b4f1d5699ea4a4b177886 | |
| parent | 687a4d9ac7fcdbd935f81a0def567a1092306f7a (diff) | |
| download | nextcloud-server-backport/50874/stable29.tar.gz nextcloud-server-backport/50874/stable29.zip | |
fix: Initialize lastConnectionCheck after first connectionbackport/50874/stable29
We are checking whether the DB connection is alive once every 30 seconds. But when we are lacking the last check time, we are skipping the check and reconnect logic. This is causing the reconnect logic to never fire in those cases.
It seems to me that "those cases", are actually always the case, as upon initialization, we are not using the proper connection name to store the time.
In the `connect()` logic, when `$this->_conn` is null, `$this->getConnectionName()` is returning `replica`, so `$this->lastConnectionCheck` will be equal to `['replica' => time()];`
https://github.com/nextcloud/server/blob/60711ea4cfde6f53d0b18bcd7e166a34a43056a5/lib/private/DB/Connection.php#L215-L221
https://github.com/nextcloud/server/blob/60711ea4cfde6f53d0b18bcd7e166a34a43056a5/lib/private/DB/Connection.php#L891-L893
https://github.com/nextcloud/3rdparty/blob/2b6d7bf65ff242ea050e736925f752a38d8da220/doctrine/dbal/src/Connections/PrimaryReadReplicaConnection.php#L136-L139
Then, if the connection name ends up as being 'primary', the reconnect logic is skipped:
https://github.com/nextcloud/server/blob/60711ea4cfde6f53d0b18bcd7e166a34a43056a5/lib/private/DB/Connection.php#L874-L880
Follow-up of https://github.com/nextcloud/server/pull/41819
Signed-off-by: Louis Chemineau <louis@chmn.me>
| -rw-r--r-- | lib/private/DB/Connection.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 6e2db8e47bc..ff365c9b100 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -152,8 +152,6 @@ class Connection extends PrimaryReadReplicaConnection { 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'); @@ -161,6 +159,8 @@ class Connection extends PrimaryReadReplicaConnection { $status = parent::connect(); $eventLogger->end('connect:db'); + $this->lastConnectionCheck[$this->getConnectionName()] = time(); + return $status; } catch (Exception $e) { // throw a new exception to prevent leaking info from the stacktrace |