Skip to content

Better balancer upstream errors when can't connect #34739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jubrad wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −5
Open

Better balancer upstream errors when can't connect #34739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/balancerd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,21 @@ impl PgwireBalancer {
.tenant
.as_ref()
.map(|tenant| metrics.tenant_connections(tenant));
let Ok(mut mz_stream) =
Self::init_stream(conn, resolved.addr, resolved.password, params, internal_tls).await
else {
return Ok(());
};
let mut mz_stream =
match Self::init_stream(conn, resolved.addr, resolved.password, params, internal_tls)
.await
{
Ok(stream) => stream,
Err(e) => {
error!("failed to connect to upstream server: {e}");
return conn
.send(ErrorResponse::fatal(
SqlState::SQLSERVER_REJECTED_ESTABLISHMENT_OF_SQLCONNECTION,
"upstream server not available",
))
.await;
}
};

let mut client_counter = CountingConn::new(conn.inner_mut());

Expand Down