kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: timeout in pg executor on postgresql connection after 20s

Browse Source
This commit is contained in:
Ruben Fiszel
2024-09-12 18:49:43 +02:00
parent 7c16f2cef4
commit 4dc9ca7f4e
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
backend/windmill-worker/src/pg_executor.rs
View File

@@ -232,15 +232,21 @@ pub async fn do_postgresql(
.danger_accept_invalid_hostnames(true);
}
let (client, connection) = tokio_postgres::connect(
&database_string,
MakeTlsConnector::new(connector.build().map_err(to_anyhow)?),
let (client, connection) = tokio::time::timeout(
std::time::Duration::from_secs(20),
tokio_postgres::connect(
&database_string,
MakeTlsConnector::new(connector.build().map_err(to_anyhow)?),
),
)
.await
.map_err(to_anyhow)?
.map_err(to_anyhow)?;
let handle = tokio::spawn(async move {
if let Err(e) = connection.await {
if let Err(e) =
tokio::time::timeout(std::time::Duration::from_secs(20), connection).await
{
let mut mtex = CONNECTION_CACHE.lock().await;
*mtex = None;
tracing::error!("connection error: {}", e);
@@ -249,11 +255,18 @@ pub async fn do_postgresql(
Some((client, handle))
} else {
tracing::info!("Creating new connection");
let (client, connection) = tokio_postgres::connect(&database_string, NoTls)
.await
.map_err(to_anyhow)?;
let (client, connection) = tokio::time::timeout(
std::time::Duration::from_secs(20),
tokio_postgres::connect(&database_string, NoTls),
)
.await
.map_err(to_anyhow)?
.map_err(to_anyhow)?;
let handle = tokio::spawn(async move {
if let Err(e) = connection.await {
if let Err(e) =
tokio::time::timeout(std::time::Duration::from_secs(20), connection).await
{
let mut mtex = CONNECTION_CACHE.lock().await;
*mtex = None;
tracing::error!("connection error: {}", e);