Skip to content

Commit

Permalink
fix: get back health check for postgres legacy (#3010)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivansete-status authored Sep 10, 2024
1 parent 780ebf3 commit 5a0edff
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import
../../../waku_core,
../../common,
../../driver,
./postgres_healthcheck,
../../../common/databases/db_postgres as waku_postgres

type PostgresDriver* = ref object of ArchiveDriver
Expand Down Expand Up @@ -132,6 +133,12 @@ proc new*(
let writeConnPool = PgAsyncPool.new(dbUrl, maxNumConnOnEachPool).valueOr:
return err("error creating write conn pool PgAsyncPool")

if not isNil(onFatalErrorAction):
asyncSpawn checkConnectivity(readConnPool, onFatalErrorAction)

if not isNil(onFatalErrorAction):
asyncSpawn checkConnectivity(writeConnPool, onFatalErrorAction)

let driver = PostgresDriver(writeConnPool: writeConnPool, readConnPool: readConnPool)
return ok(driver)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{.push raises: [].}

import chronos, chronicles, results
import ../../../common/databases/db_postgres, ../../../common/error_handling

## Simple query to validate that the postgres is working and attending requests
const HealthCheckQuery = "SELECT version();"
const CheckConnectivityInterval = 60.seconds
const MaxNumTrials = 20
const TrialInterval = 1.seconds

proc checkConnectivity*(
connPool: PgAsyncPool, onFatalErrorAction: OnFatalErrorHandler
) {.async.} =
while true:
(await connPool.pgQuery(HealthCheckQuery)).isOkOr:
## The connection failed once. Let's try reconnecting for a while.
## Notice that the 'pgQuery' proc tries to establish a new connection.

block errorBlock:
## Force close all the opened connections. No need to close gracefully.
(await connPool.resetConnPool()).isOkOr:
onFatalErrorAction("checkConnectivity legacy resetConnPool error: " & error)

var numTrial = 0
while numTrial < MaxNumTrials:
let res = await connPool.pgQuery(HealthCheckQuery)
if res.isOk():
## Connection resumed. Let's go back to the normal healthcheck.
break errorBlock

await sleepAsync(TrialInterval)
numTrial.inc()

## The connection couldn't be resumed. Let's inform the upper layers.
onFatalErrorAction("postgres legacy health check error: " & error)

await sleepAsync(CheckConnectivityInterval)

0 comments on commit 5a0edff

Please sign in to comment.