From 22a848cf2b69655329af244fa406db31d1f0654c Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 2 Nov 2023 10:34:59 +0000 Subject: [PATCH] control_plane: use `pageserver/` sub path for local_fs --- control_plane/src/bin/neon_local.rs | 2 +- control_plane/src/pageserver.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control_plane/src/bin/neon_local.rs b/control_plane/src/bin/neon_local.rs index 5e4d3a85e9..87ea519a9e 100644 --- a/control_plane/src/bin/neon_local.rs +++ b/control_plane/src/bin/neon_local.rs @@ -337,7 +337,7 @@ fn handle_init(init_match: &ArgMatches) -> anyhow::Result { .context("Failed to initialize neon repository")?; // Create remote storage location for default LocalFs remote storage - std::fs::create_dir(env.base_data_dir.join(PAGESERVER_REMOTE_STORAGE_DIR))?; + std::fs::create_dir_all(env.base_data_dir.join(PAGESERVER_REMOTE_STORAGE_DIR))?; // Initialize pageserver, create initial tenant and timeline. for ps_conf in &env.pageservers { diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index 6a9d717465..e13a234e89 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -34,7 +34,7 @@ use crate::local_env::PageServerConf; use crate::{background_process, local_env::LocalEnv}; /// Directory within .neon which will be used by default for LocalFs remote storage. -pub const PAGESERVER_REMOTE_STORAGE_DIR: &str = "local_fs_remote_storage"; +pub const PAGESERVER_REMOTE_STORAGE_DIR: &str = "local_fs_remote_storage/pageserver"; #[derive(Error, Debug)] pub enum PageserverHttpError {