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

Improve errors

Browse Source
This commit is contained in:
Bojan Serafimov
2022-06-12 12:23:43 -04:00
parent 909a0df048
commit cd081280bf
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
control_plane/src/storage.rs
View File

@@ -543,7 +543,7 @@ impl PageServerNode {
let base_tarfile = File::open(base_tarfile_path)?;
let mut base_reader = BufReader::new(base_tarfile);
// If there's any wal, extend the reader and end_lsn
// Init wal reader if necessary
let (end_lsn, wal_reader) = if let Some((end_lsn, wal_tarfile_path)) = pg_wal {
let wal_tarfile = File::open(wal_tarfile_path)?;
let wal_reader = BufReader::new(wal_tarfile);
@@ -559,7 +559,7 @@ impl PageServerNode {
io::copy(&mut base_reader, &mut writer)?;
writer.finish()?;
// Import wal
// Import wal if necessary
if let Some(mut wal_reader) = wal_reader {
let import_cmd = format!("import wal {tenant_id} {timeline_id} {start_lsn} {end_lsn}");
let mut writer = client.copy_in(&import_cmd)?;

13
pageserver/src/page_service.rs
View File

@@ -261,9 +261,11 @@ impl<'a> Read for CopyInReader<'a> {
let copy_data_bytes = match message {
FeMessage::CopyData(bytes) => bytes,
FeMessage::CopyDone => return Ok(0),
FeMessage::Sync => continue,
m => {
info!("unexpected copy in client message {:?}", m);
continue;
let msg = format!("unexpected message {:?}", m);
self.pgb.write_message(&BeMessage::ErrorResponse(&msg))?;
return Err(io::Error::new(io::ErrorKind::Other, msg));
}
};
@@ -274,12 +276,13 @@ impl<'a> Read for CopyInReader<'a> {
return Ok(bytes_read);
}
Ok(None) => {
// Is this ok?
return Ok(0);
let msg = "client closed connection";
self.pgb.write_message(&BeMessage::ErrorResponse(msg))?;
return Err(io::Error::new(io::ErrorKind::Other, msg));
}
Err(e) => {
if !is_socket_read_timed_out(&e) {
todo!("return io::Error");
return Err(io::Error::new(io::ErrorKind::Other, e));
}
}
}