From 872e645f7db2ae2255aadd008c77f6c38867591b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arpad=20M=C3=BCller?= Date: Mon, 22 Jan 2024 23:47:08 +0100 Subject: [PATCH] Disable cancellation support in initdb --- pageserver/src/tenant.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs index 7178a6e008..c18c682447 100644 --- a/pageserver/src/tenant.rs +++ b/pageserver/src/tenant.rs @@ -449,6 +449,7 @@ pub enum CreateTimelineError { #[derive(thiserror::Error, Debug)] enum InitdbError { Other(anyhow::Error), + #[allow(unused)] Cancelled, Spawn(std::io::Result<()>), Failed(std::process::ExitStatus, Vec), @@ -3732,7 +3733,7 @@ async fn run_initdb( conf: &'static PageServerConf, initdb_target_dir: &Utf8Path, pg_version: u32, - cancel: &CancellationToken, + _cancel: &CancellationToken, ) -> Result<(), InitdbError> { let initdb_bin_path = conf .pg_bin_dir(pg_version) @@ -3776,10 +3777,10 @@ async fn run_initdb( return Err(InitdbError::Failed(exit_status, stderr_vec)); } } - _ = cancel.cancelled() => { + /*_ = cancel.cancelled() => { initdb_command.kill().await?; return Err(InitdbError::Cancelled); - } + }*/ } Ok(())