rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-05 20:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support returning errors from page service

Browse Source
This commit is contained in:
Stas Kelvich
2021-05-19 15:56:12 +03:00
parent 4c35b22626
commit 4d5a41301d
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pageserver/src/branches.rs
View File

@@ -4,7 +4,7 @@
// TODO: move all paths construction to conf impl
//
use anyhow::{anyhow, Context, Result};
use anyhow::{anyhow, bail, Context, Result};
use bytes::Bytes;
use fs::File;
use fs_extra;
@@ -274,7 +274,7 @@ fn parse_point_in_time(conf: &PageServerConf, s: &str) -> Result<PointInTime> {
}
}
panic!("could not parse point-in-time {}", s);
bail!("could not parse point-in-time {}", s);
}
// If control file says the cluster was shut down cleanly, modify it, to mark

22
pageserver/src/page_service.rs
View File

@@ -60,6 +60,7 @@ enum BeMessage {
CommandComplete,
ControlFile,
CopyData(Bytes),
ErrorResponse(String),
}
// Wrapped in libpq CopyData
@@ -575,6 +576,16 @@ impl Connection {
self.stream.write_u32::<BE>(4 + data.len() as u32)?;
self.stream.write_all(&data)?;
}
BeMessage::ErrorResponse(error_msg) => {
self.stream.write_u8(b'E')?;
self.stream
.write_u32::<BE>(4 + 1 + error_msg.len() as u32 + 2)?;
self.stream.write_u8(b'M')?; /* primary human-readable error message */
self.stream.write_all(error_msg.as_bytes())?;
self.stream.write_u8(0)?; /* end of M field */
self.stream.write_u8(0)?; /* end of all fields */
}
}
Ok(())
@@ -612,7 +623,12 @@ impl Connection {
}
}
Some(FeMessage::Query(m)) => {
self.process_query(m.body)?;
if let Err(e) = self.process_query(m.body) {
self.write_message_noflush(&BeMessage::ErrorResponse(format!(
"ERROR: {}",
e
)))?;
}
self.write_message(&BeMessage::ReadyForQuery)?;
}
Some(FeMessage::Parse(m)) => {
@@ -752,9 +768,7 @@ impl Connection {
self.write_message_noflush(&BeMessage::DataRow(Bytes::from(system_id)))?;
self.write_message_noflush(&BeMessage::CommandComplete)?;
} else {
self.write_message_noflush(&BeMessage::RowDescription)?;
self.write_message_noflush(&HELLO_WORLD_ROW)?;
self.write_message_noflush(&BeMessage::CommandComplete)?;
bail!("unknown command");
}
Ok(())