From a52b563b5907686689f7cfb6fcba5c9e8bc19db3 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sat, 4 May 2024 11:47:38 +0000 Subject: [PATCH] fixups --- pageserver/src/bin/pageserver.rs | 3 +++ test_runner/regress/test_pageserver_api.py | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs index 457dc6d09e..e9433de05b 100644 --- a/pageserver/src/bin/pageserver.rs +++ b/pageserver/src/bin/pageserver.rs @@ -155,6 +155,9 @@ fn initialize_config( let file_contents: Option = match std::fs::File::open(cfg_file_path) { Ok(mut f) => { + if init { + anyhow::bail!("config file already exists: {cfg_file_path}"); + } let md = f.metadata().context("stat config file")?; if md.is_file() { let mut s = String::new(); diff --git a/test_runner/regress/test_pageserver_api.py b/test_runner/regress/test_pageserver_api.py index 55165e3c86..be351db429 100644 --- a/test_runner/regress/test_pageserver_api.py +++ b/test_runner/regress/test_pageserver_api.py @@ -12,7 +12,6 @@ from fixtures.types import Lsn, TenantId, TimelineId from fixtures.utils import wait_until -# test that we cannot override node id after init def test_pageserver_init_node_id( neon_simple_env: NeonEnv, neon_binpath: Path, pg_distrib_dir: Path ): @@ -49,7 +48,7 @@ def test_pageserver_init_node_id( bad_reinit = run_pageserver(good_init_cmd) assert bad_reinit.returncode == 1, "pageserver refuses to init if already exists" - assert "already exists, cannot init it" in bad_reinit.stderr + assert "config file already exists" in bad_reinit.stderr def check_client(env: NeonEnv, client: PageserverHttpClient):