rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 09:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "neon_local: only set --pageserver-config-override=remote_storage during init, not start"

Browse Source 
This reverts commit 511f593360.
This commit is contained in:
Christian Schwarz
2024-05-04 12:33:02 +00:00
parent 511f593360
commit 0bca1a5de3
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
control_plane/src/pageserver.rs
View File

@@ -157,6 +157,15 @@ impl PageServerNode {
}
}
if !cli_overrides
.iter()
.any(|c| c.starts_with("remote_storage"))
{
overrides.push(format!(
"remote_storage={{local_path='../{PAGESERVER_REMOTE_STORAGE_DIR}'}}"
));
}
if *http_auth_type != AuthType::Trust || *pg_auth_type != AuthType::Trust {
// Keys are generated in the toplevel repo dir, pageservers' workdirs
// are one level below that, so refer to keys with ../
@@ -211,14 +220,6 @@ impl PageServerNode {
format!("Cannot start pageserver node {node_id} in path that has no string representation: {datadir:?}")
})?;
let mut args = self.pageserver_basic_args(config_overrides, datadir_path_str);
if !config_overrides
.iter()
.any(|c| c.starts_with("remote_storage"))
{
args.push(Cow::Owned(format!(
"--pageserver-config-override=remote_storage={{local_path='../{PAGESERVER_REMOTE_STORAGE_DIR}'}}"
)));
}
args.push(Cow::Borrowed("--init"));
let init_output = Command::new(self.env.pageserver_bin())