docker/pgcat
1
0
Fork 0
mirror of https://github.com/postgresml/pgcat.git synced 2026-03-27 18:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require a reason when marking a server bad (#654)

Browse Source 
When calling mark_bad require a reason so it can be logged rather than
the generic message
This commit is contained in:
Alec
2023-12-04 19:09:41 -05:00
committed by GitHub
parent bc07dc9c81
commit 4dbef49ec9
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client.rs
View File

@@ -1437,7 +1437,7 @@ where
.await .await
{ {
// We might be in some kind of error/in between protocol state // We might be in some kind of error/in between protocol state
server.mark_bad(); server.mark_bad(err.to_string().as_str());
return Err(err); return Err(err);
} }
@@ -1504,7 +1504,7 @@ where
match write_all_flush(&mut self.write, &response).await { match write_all_flush(&mut self.write, &response).await {
Ok(_) => (), Ok(_) => (),
Err(err) => { Err(err) => {
server.mark_bad(); server.mark_bad(err.to_string().as_str());
return Err(err); return Err(err);
} }
}; };
@@ -1926,7 +1926,7 @@ where
Ok(_) => (), Ok(_) => (),
Err(err) => { Err(err) => {
// We might be in some kind of error/in between protocol state, better to just kill this server // We might be in some kind of error/in between protocol state, better to just kill this server
server.mark_bad(); server.mark_bad(err.to_string().as_str());
return Err(err); return Err(err);
} }
}; };
@@ -1993,11 +1993,13 @@ where
} }
}, },
Err(_) => { Err(_) => {
error!( server.mark_bad(
format!(
"Statement timeout while talking to {:?} with user {}", "Statement timeout while talking to {:?} with user {}",
address, pool.settings.user.username address, pool.settings.user.username
)
.as_str(),
); );
server.mark_bad();
pool.ban(address, BanReason::StatementTimeout, Some(client_stats)); pool.ban(address, BanReason::StatementTimeout, Some(client_stats));
error_response_terminal(&mut self.write, "pool statement timeout").await?; error_response_terminal(&mut self.write, "pool statement timeout").await?;
Err(Error::StatementTimeout) Err(Error::StatementTimeout)

10
src/mirrors.rs
View File

@@ -85,8 +85,9 @@ impl MirroredClient {
match recv_result { match recv_result {
Ok(message) => trace!("Received from mirror: {} {:?}", String::from_utf8_lossy(&message[..]), address.clone()), Ok(message) => trace!("Received from mirror: {} {:?}", String::from_utf8_lossy(&message[..]), address.clone()),
Err(err) => { Err(err) => {
server.mark_bad(); server.mark_bad(
error!("Failed to receive from mirror {:?} {:?}", err, address.clone()); format!("Failed to send to mirror, Discarding message {:?}, {:?}", err, address.clone()).as_str()
);
} }
} }
} }
@@ -98,8 +99,9 @@ impl MirroredClient {
match server.send(&BytesMut::from(&bytes[..])).await { match server.send(&BytesMut::from(&bytes[..])).await {
Ok(_) => trace!("Sent to mirror: {} {:?}", String::from_utf8_lossy(&bytes[..]), address.clone()), Ok(_) => trace!("Sent to mirror: {} {:?}", String::from_utf8_lossy(&bytes[..]), address.clone()),
Err(err) => { Err(err) => {
server.mark_bad(); server.mark_bad(
error!("Failed to send to mirror, Discarding message {:?}, {:?}", err, address.clone()) format!("Failed to receive from mirror {:?} {:?}", err, address.clone()).as_str()
);
} }
} }
} }

2
src/pool.rs
View File

@@ -871,7 +871,7 @@ impl ConnectionPool {
} }
// Don't leave a bad connection in the pool. // Don't leave a bad connection in the pool.
server.mark_bad(); server.mark_bad("failed health check");
self.ban(address, BanReason::FailedHealthCheck, Some(client_info)); self.ban(address, BanReason::FailedHealthCheck, Some(client_info));
false false

4
src/server.rs
View File

@@ -1279,8 +1279,8 @@ impl Server {
} }
/// Indicate that this server connection cannot be re-used and must be discarded. /// Indicate that this server connection cannot be re-used and must be discarded.
pub fn mark_bad(&mut self) { pub fn mark_bad(&mut self, reason: &str) {
error!("Server {:?} marked bad", self.address); error!("Server {:?} marked bad, reason: {}", self.address, reason);
self.bad = true; self.bad = true;
} }