From dd54c7e68756de8bca191957f23ee425c83c9491 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 5 Oct 2023 09:57:20 +0100 Subject: [PATCH] Clean up unreachable blocks after fatal_io_error --- pageserver/src/deletion_queue/list_writer.rs | 4 ---- pageserver/src/deletion_queue/validator.rs | 2 -- pageserver/src/virtual_file.rs | 1 - 3 files changed, 7 deletions(-) diff --git a/pageserver/src/deletion_queue/list_writer.rs b/pageserver/src/deletion_queue/list_writer.rs index 919e44ed49..345f95b023 100644 --- a/pageserver/src/deletion_queue/list_writer.rs +++ b/pageserver/src/deletion_queue/list_writer.rs @@ -198,7 +198,6 @@ impl ListWriter { Ok(None) } else { on_fatal_io_error(&e); - unreachable!(); } } } @@ -227,8 +226,6 @@ impl ListWriter { // This is fatal: any failure to read this local directory indicates a // storage problem or configuration problem of the node. virtual_file::on_fatal_io_error(&e); - - return Err(e.into()); } }; @@ -300,7 +297,6 @@ impl ListWriter { Ok(b) => b, Err(e) => { virtual_file::on_fatal_io_error(&e); - unreachable!(); } }; diff --git a/pageserver/src/deletion_queue/validator.rs b/pageserver/src/deletion_queue/validator.rs index 46b8ceffb1..033dc1c890 100644 --- a/pageserver/src/deletion_queue/validator.rs +++ b/pageserver/src/deletion_queue/validator.rs @@ -306,8 +306,6 @@ where metrics::DELETION_QUEUE.unexpected_errors.inc(); on_fatal_io_error(&e); - - break; } } } diff --git a/pageserver/src/virtual_file.rs b/pageserver/src/virtual_file.rs index 0a162c70d1..98ad872f3c 100644 --- a/pageserver/src/virtual_file.rs +++ b/pageserver/src/virtual_file.rs @@ -275,7 +275,6 @@ impl Error { // having to apply the same "terminate on errors" behavior. if is_fatal_io_error(&instance.inner) { on_fatal_io_error(&instance.inner); - unreachable!(); } instance