diff --git a/control_plane/src/broker.rs b/control_plane/src/broker.rs index 7b6943f9c1..f40705863b 100644 --- a/control_plane/src/broker.rs +++ b/control_plane/src/broker.rs @@ -19,7 +19,7 @@ pub async fn start_broker_process(env: &local_env::LocalEnv) -> anyhow::Result<( let args = [format!("--listen-addr={listen_addr}")]; - let client = reqwest::blocking::Client::new(); + let client = reqwest::Client::new(); background_process::start_process( "storage_broker", &env.base_data_dir, @@ -36,7 +36,7 @@ pub async fn start_broker_process(env: &local_env::LocalEnv) -> anyhow::Result<( .get(status_url) .build() .with_context(|| format!("Failed to construct request to broker endpoint {url}"))?; - match client.execute(request) { + match client.execute(request).await { Ok(resp) => Ok(resp.status().is_success()), Err(_) => Ok(false), } diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index 3e7e335a68..a0256c1e52 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -224,11 +224,7 @@ impl PageServerNode { self.pageserver_env_variables()?, background_process::InitialPidFile::Expect(self.pid_file()), || async { - let rt = tokio::runtime::Builder::new_current_thread() - .enable_all() - .build() - .unwrap(); - let st = rt.block_on(self.check_status()); + let st = self.check_status().await; match st { Ok(()) => Ok(true), Err(mgmt_api::Error::ReceiveBody(_)) => Ok(false),