From ffd778a4a2bd14d2f840f5c98a3c1ce38d45c02a Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 6 Jul 2022 22:24:08 +0300 Subject: [PATCH] If an error happens during import of base backup or WAL, log it. We only sent the error to the client, with no trace in the pageserver log. Log it, similar to how we log errors in GetPage@LSN requests. --- pageserver/src/page_service.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index 8eabcba820..2158e9f644 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -926,7 +926,10 @@ impl postgres_backend::Handler for PageServerHandler { match self.handle_import_basebackup(pgb, tenant, timeline, base_lsn, end_lsn) { Ok(()) => pgb.write_message_noflush(&BeMessage::CommandComplete(b"SELECT 1"))?, - Err(e) => pgb.write_message_noflush(&BeMessage::ErrorResponse(&e.to_string()))?, + Err(e) => { + error!("error importing base backup between {base_lsn} and {end_lsn}: {e:?}"); + pgb.write_message_noflush(&BeMessage::ErrorResponse(&e.to_string()))? + } }; } else if query_string.starts_with("import wal ") { // Import the `pg_wal` section of a basebackup. @@ -945,7 +948,10 @@ impl postgres_backend::Handler for PageServerHandler { match self.handle_import_wal(pgb, tenant, timeline, start_lsn, end_lsn) { Ok(()) => pgb.write_message_noflush(&BeMessage::CommandComplete(b"SELECT 1"))?, - Err(e) => pgb.write_message_noflush(&BeMessage::ErrorResponse(&e.to_string()))?, + Err(e) => { + error!("error importing WAL between {start_lsn} and {end_lsn}: {e:?}"); + pgb.write_message_noflush(&BeMessage::ErrorResponse(&e.to_string()))? + } }; } else if query_string.to_ascii_lowercase().starts_with("set ") { // important because psycopg2 executes "SET datestyle TO 'ISO'"