undo the renaming, it's too much churn for review; will do in a separate PR

2026-01-17 10:22:56 +00:00 · 2024-05-04 13:12:35 +00:00
parent d72fe6f5ee
commit 25dfafc2df
24 changed files with 37 additions and 37 deletions
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -451,7 +451,7 @@ class NeonEnvBuilder:
        test_overlay_dir: Optional[Path] = None,
        pageserver_remote_storage: Optional[RemoteStorage] = None,
        # toml that will be decomposed into `--config-override` flags during `pageserver --init`
-        pageserver_init_overrides: Optional[str] = None,
+        pageserver_config_override: Optional[str] = None,
        num_safekeepers: int = 1,
        num_pageservers: int = 1,
        # Use non-standard SK ids to check for various parsing bugs
@@ -478,7 +478,7 @@ class NeonEnvBuilder:
        self.broker = broker
        self.run_id = run_id
        self.mock_s3_server: MockS3Server = mock_s3_server
-        self.pageserver_init_overrides = pageserver_init_overrides
+        self.pageserver_config_override = pageserver_config_override
        self.num_safekeepers = num_safekeepers
        self.num_pageservers = num_pageservers
        self.safekeepers_id_start = safekeepers_id_start
@@ -1134,7 +1134,7 @@ class NeonEnv:
        self.neon_cli.init(
            cfg,
            force=config.config_init_force,
-            pageserver_init_overrides=config.pageserver_init_overrides,
+            pageserver_config_override=config.pageserver_config_override,
        )

    def start(self):
@@ -1707,7 +1707,7 @@ class NeonCli(AbstractNeonCli):
        self,
        config: Dict[str, Any],
        force: Optional[str] = None,
-        pageserver_init_overrides: Optional[str] = None,
+        pageserver_config_override: Optional[str] = None,
    ) -> "subprocess.CompletedProcess[str]":
        with tempfile.NamedTemporaryFile(mode="w+") as tmp:
            tmp.write(toml.dumps(config))
@@ -1733,10 +1733,10 @@ class NeonCli(AbstractNeonCli):
                    f"--pageserver-config-override={o.strip()}" for o in env_overrides.split(";")
                ]

-            if pageserver_init_overrides is not None:
+            if pageserver_config_override is not None:
                cmd += [
                    f"--pageserver-config-override={o.strip()}"
-                    for o in pageserver_init_overrides.split(";")
+                    for o in pageserver_config_override.split(";")
                ]

            s3_env_vars = None
--- a/test_runner/performance/pageserver/pagebench/test_large_slru_basebackup.py
+++ b/test_runner/performance/pageserver/pagebench/test_large_slru_basebackup.py
@@ -45,7 +45,7 @@ def test_basebackup_with_high_slru_count(
    # configure cache sizes like in prod
    page_cache_size = 16384
    max_file_descriptors = 500000
-    neon_env_builder.pageserver_init_overrides = (
+    neon_env_builder.pageserver_config_override = (
        f"page_cache_size={page_cache_size}; max_file_descriptors={max_file_descriptors}; "
        f"get_vectored_impl='{get_vectored_impl}'; validate_vectored_get=false"
    )
--- a/test_runner/performance/pageserver/pagebench/test_pageserver_max_throughput_getpage_at_latest_lsn.py
+++ b/test_runner/performance/pageserver/pagebench/test_pageserver_max_throughput_getpage_at_latest_lsn.py
@@ -66,7 +66,7 @@ def test_pageserver_max_throughput_getpage_at_latest_lsn(
    # configure cache sizes like in prod
    page_cache_size = 16384
    max_file_descriptors = 500000
-    neon_env_builder.pageserver_init_overrides = (
+    neon_env_builder.pageserver_config_override = (
        f"page_cache_size={page_cache_size}; max_file_descriptors={max_file_descriptors}"
    )
    params.update(
--- a/test_runner/regress/test_branch_behind.py
+++ b/test_runner/regress/test_branch_behind.py
@@ -11,7 +11,7 @@ from fixtures.utils import print_gc_result, query_scalar
 #
 def test_branch_behind(neon_env_builder: NeonEnvBuilder):
    # Disable pitr, because here we want to test branch creation after GC
-    neon_env_builder.pageserver_init_overrides = "tenant_config={pitr_interval = '0 sec'}"
+    neon_env_builder.pageserver_config_override = "tenant_config={pitr_interval = '0 sec'}"
    env = neon_env_builder.init_start()

    error_regexes = [
--- a/test_runner/regress/test_compaction.py
+++ b/test_runner/regress/test_compaction.py
@@ -31,7 +31,7 @@ def test_pageserver_compaction_smoke(neon_env_builder: NeonEnvBuilder):

    # Effectively disable the page cache to rely only on image layers
    # to shorten reads.
-    neon_env_builder.pageserver_init_overrides = """
+    neon_env_builder.pageserver_config_override = """
 page_cache_size=10
 """

--- a/test_runner/regress/test_gc_aggressive.py
+++ b/test_runner/regress/test_gc_aggressive.py
@@ -67,7 +67,7 @@ async def update_and_gc(env: NeonEnv, endpoint: Endpoint, timeline: TimelineId):
 #
 def test_gc_aggressive(neon_env_builder: NeonEnvBuilder):
    # Disable pitr, because here we want to test branch creation after GC
-    neon_env_builder.pageserver_init_overrides = "tenant_config={pitr_interval = '0 sec'}"
+    neon_env_builder.pageserver_config_override = "tenant_config={pitr_interval = '0 sec'}"
    env = neon_env_builder.init_start()
    timeline = env.neon_cli.create_branch("test_gc_aggressive", "main")
    endpoint = env.endpoints.create_start("test_gc_aggressive")
@@ -95,7 +95,7 @@ def test_gc_aggressive(neon_env_builder: NeonEnvBuilder):
 #
 def test_gc_index_upload(neon_env_builder: NeonEnvBuilder):
    # Disable time-based pitr, we will use LSN-based thresholds in the manual GC calls
-    neon_env_builder.pageserver_init_overrides = "tenant_config={pitr_interval = '0 sec'}"
+    neon_env_builder.pageserver_config_override = "tenant_config={pitr_interval = '0 sec'}"
    num_index_uploads = 0

    neon_env_builder.enable_pageserver_remote_storage(RemoteStorageKind.LOCAL_FS)
--- a/test_runner/regress/test_local_file_cache.py
+++ b/test_runner/regress/test_local_file_cache.py
@@ -11,7 +11,7 @@ from fixtures.utils import query_scalar
 def test_local_file_cache_unlink(neon_env_builder: NeonEnvBuilder, build_type: str):
    if build_type == "debug":
        # Disable vectored read path cross validation since it makes the test time out.
-        neon_env_builder.pageserver_init_overrides = "validate_vectored_get=false"
+        neon_env_builder.pageserver_config_override = "validate_vectored_get=false"

    env = neon_env_builder.init_start()

--- a/test_runner/regress/test_old_request_lsn.py
+++ b/test_runner/regress/test_old_request_lsn.py
@@ -16,7 +16,7 @@ from fixtures.utils import print_gc_result, query_scalar
 #
 def test_old_request_lsn(neon_env_builder: NeonEnvBuilder):
    # Disable pitr, because here we want to test branch creation after GC
-    neon_env_builder.pageserver_init_overrides = "tenant_config={pitr_interval = '0 sec'}"
+    neon_env_builder.pageserver_config_override = "tenant_config={pitr_interval = '0 sec'}"
    env = neon_env_builder.init_start()
    env.neon_cli.create_branch("test_old_request_lsn", "main")
    endpoint = env.endpoints.create_start("test_old_request_lsn")
--- a/test_runner/regress/test_pageserver_config.py
+++ b/test_runner/regress/test_pageserver_config.py
@@ -7,7 +7,7 @@ from fixtures.neon_fixtures import (

@pytest.mark.parametrize("kind", ["sync", "async"])
 def test_walredo_process_kind_config(neon_env_builder: NeonEnvBuilder, kind: str):
-    neon_env_builder.pageserver_init_overrides = f"walredo_process_kind = '{kind}'"
+    neon_env_builder.pageserver_config_override = f"walredo_process_kind = '{kind}'"
    # ensure it starts
    env = neon_env_builder.init_start()
    # ensure the metric is set
--- a/test_runner/regress/test_pageserver_layer_rolling.py
+++ b/test_runner/regress/test_pageserver_layer_rolling.py
@@ -241,7 +241,7 @@ def test_total_size_limit(neon_env_builder: NeonEnvBuilder):
    ephemeral_bytes_per_memory_kb = (max_dirty_data * 1024) // system_memory
    assert ephemeral_bytes_per_memory_kb > 0

-    neon_env_builder.pageserver_init_overrides = f"""
+    neon_env_builder.pageserver_config_override = f"""
        ephemeral_bytes_per_memory_kb={ephemeral_bytes_per_memory_kb}
        """

--- a/test_runner/regress/test_pageserver_metric_collection.py
+++ b/test_runner/regress/test_pageserver_metric_collection.py
@@ -54,7 +54,7 @@ def test_metric_collection(
    #
    # Disable time-based pitr, we will use the manual GC calls
    # to trigger remote storage operations in a controlled way
-    neon_env_builder.pageserver_init_overrides = f"""
+    neon_env_builder.pageserver_config_override = f"""
        metric_collection_interval="1s"
        metric_collection_endpoint="{metric_collection_endpoint}"
        metric_collection_bucket={remote_storage_to_toml_inline_table(neon_env_builder.pageserver_remote_storage)}
@@ -216,7 +216,7 @@ def test_metric_collection_cleans_up_tempfile(
    #
    # Disable time-based pitr, we will use the manual GC calls
    # to trigger remote storage operations in a controlled way
-    neon_env_builder.pageserver_init_overrides = f"""
+    neon_env_builder.pageserver_config_override = f"""
        metric_collection_interval="1s"
        metric_collection_endpoint="{metric_collection_endpoint}"
        cached_metric_collection_interval="0s"
--- a/test_runner/regress/test_pg_regress.py
+++ b/test_runner/regress/test_pg_regress.py
@@ -34,7 +34,7 @@ def test_pg_regress(

    if build_type == "debug":
        # Disable vectored read path cross validation since it makes the test time out.
-        neon_env_builder.pageserver_init_overrides = "validate_vectored_get=false"
+        neon_env_builder.pageserver_config_override = "validate_vectored_get=false"

    neon_env_builder.enable_pageserver_remote_storage(s3_storage())
    neon_env_builder.enable_scrub_on_exit()
--- a/test_runner/regress/test_pitr_gc.py
+++ b/test_runner/regress/test_pitr_gc.py
@@ -10,7 +10,7 @@ from fixtures.utils import print_gc_result, query_scalar
 #
 def test_pitr_gc(neon_env_builder: NeonEnvBuilder):
    # Set pitr interval such that we need to keep the data
-    neon_env_builder.pageserver_init_overrides = (
+    neon_env_builder.pageserver_config_override = (
        "tenant_config={pitr_interval = '1 day', gc_horizon = 0}"
    )

--- a/test_runner/regress/test_recovery.py
+++ b/test_runner/regress/test_recovery.py
@@ -10,7 +10,7 @@ from fixtures.neon_fixtures import NeonEnvBuilder
 #
 def test_pageserver_recovery(neon_env_builder: NeonEnvBuilder):
    # Override default checkpointer settings to run it more often
-    neon_env_builder.pageserver_init_overrides = "tenant_config={checkpoint_distance = 1048576}"
+    neon_env_builder.pageserver_config_override = "tenant_config={checkpoint_distance = 1048576}"

    env = neon_env_builder.init_start()
    env.pageserver.is_testing_enabled_or_skip()
--- a/test_runner/regress/test_remote_storage.py
+++ b/test_runner/regress/test_remote_storage.py
@@ -70,7 +70,7 @@ def test_remote_storage_backup_and_restore(
    # Exercise retry code path by making all uploads and downloads fail for the
    # first time. The retries print INFO-messages to the log; we will check
    # that they are present after the test.
-    neon_env_builder.pageserver_init_overrides = "test_remote_failures=1"
+    neon_env_builder.pageserver_config_override = "test_remote_failures=1"

    data_id = 1
    data = "just some data"
--- a/test_runner/regress/test_tenant_conf.py
+++ b/test_runner/regress/test_tenant_conf.py
@@ -15,7 +15,7 @@ from fixtures.utils import wait_until
 def test_tenant_config(neon_env_builder: NeonEnvBuilder):
    """Test per tenant configuration"""
    # set some non-default global config
-    neon_env_builder.pageserver_init_overrides = """
+    neon_env_builder.pageserver_config_override = """
 page_cache_size=444;
 wait_lsn_timeout='111 s';
 [tenant_config]
--- a/test_runner/regress/test_tenant_delete.py
+++ b/test_runner/regress/test_tenant_delete.py
@@ -35,7 +35,7 @@ def test_tenant_delete_smoke(
    neon_env_builder: NeonEnvBuilder,
    pg_bin: PgBin,
 ):
-    neon_env_builder.pageserver_init_overrides = "test_remote_failures=1"
+    neon_env_builder.pageserver_config_override = "test_remote_failures=1"

    remote_storage_kind = s3_storage()
    neon_env_builder.enable_pageserver_remote_storage(remote_storage_kind)
@@ -169,7 +169,7 @@ def test_delete_tenant_exercise_crash_safety_failpoints(
    pg_bin: PgBin,
 ):
    if simulate_failures:
-        neon_env_builder.pageserver_init_overrides = "test_remote_failures=1"
+        neon_env_builder.pageserver_config_override = "test_remote_failures=1"

    neon_env_builder.enable_pageserver_remote_storage(remote_storage_kind)

--- a/test_runner/regress/test_tenant_detach.py
+++ b/test_runner/regress/test_tenant_detach.py
@@ -66,7 +66,7 @@ def test_tenant_reattach(neon_env_builder: NeonEnvBuilder, mode: str):
    # Exercise retry code path by making all uploads and downloads fail for the
    # first time. The retries print INFO-messages to the log; we will check
    # that they are present after the test.
-    neon_env_builder.pageserver_init_overrides = "test_remote_failures=1"
+    neon_env_builder.pageserver_config_override = "test_remote_failures=1"

    env = neon_env_builder.init_start()
    pageserver_http = env.pageserver.http_client()
--- a/test_runner/regress/test_tenant_size.py
+++ b/test_runner/regress/test_tenant_size.py
@@ -502,7 +502,7 @@ def test_get_tenant_size_with_multiple_branches(

    gc_horizon = 128 * 1024

-    neon_env_builder.pageserver_init_overrides = f"tenant_config={{compaction_period='0s', gc_period='0s', pitr_interval='0sec', gc_horizon={gc_horizon}}}"
+    neon_env_builder.pageserver_config_override = f"tenant_config={{compaction_period='0s', gc_period='0s', pitr_interval='0sec', gc_horizon={gc_horizon}}}"

    env = neon_env_builder.init_start()

--- a/test_runner/regress/test_tenants.py
+++ b/test_runner/regress/test_tenants.py
@@ -89,7 +89,7 @@ def test_tenants_normal_work(neon_env_builder: NeonEnvBuilder):

 def test_metrics_normal_work(neon_env_builder: NeonEnvBuilder):
    neon_env_builder.num_safekeepers = 3
-    neon_env_builder.pageserver_init_overrides = "availability_zone='test_ps_az'"
+    neon_env_builder.pageserver_config_override = "availability_zone='test_ps_az'"

    env = neon_env_builder.init_start()
    tenant_1, _ = env.neon_cli.create_tenant()
--- a/test_runner/regress/test_tenants_with_remote_storage.py
+++ b/test_runner/regress/test_tenants_with_remote_storage.py
@@ -107,7 +107,7 @@ def test_tenants_attached_after_download(neon_env_builder: NeonEnvBuilder):
    # Exercise retry code path by making all uploads and downloads fail for the
    # first time. The retries print INFO-messages to the log; we will check
    # that they are present after the test.
-    neon_env_builder.pageserver_init_overrides = "test_remote_failures=1"
+    neon_env_builder.pageserver_config_override = "test_remote_failures=1"

    ##### First start, insert secret data and upload it to the remote storage
    env = neon_env_builder.init_start()
--- a/test_runner/regress/test_threshold_based_eviction.py
+++ b/test_runner/regress/test_threshold_based_eviction.py
@@ -27,7 +27,7 @@ def test_threshold_based_eviction(
    # imitates its accesses. We'll use a non-existent endpoint to make it fail.
    # The synthetic size calculation will run regardless.
    host, port = httpserver_listen_address
-    neon_env_builder.pageserver_init_overrides = f"""
+    neon_env_builder.pageserver_config_override = f"""
        metric_collection_interval="1s"
        synthetic_size_calculation_interval="2s"
        metric_collection_endpoint="http://{host}:{port}/nonexistent"
--- a/test_runner/regress/test_timeline_size.py
+++ b/test_runner/regress/test_timeline_size.py
@@ -415,7 +415,7 @@ def test_timeline_physical_size_post_compaction(neon_env_builder: NeonEnvBuilder

    # Disable background compaction as we don't want it to happen after `get_physical_size` request
    # and before checking the expected size on disk, which makes the assertion failed
-    neon_env_builder.pageserver_init_overrides = (
+    neon_env_builder.pageserver_config_override = (
        "tenant_config={checkpoint_distance=100000, compaction_period='10m'}"
    )

@@ -462,7 +462,7 @@ def test_timeline_physical_size_post_gc(neon_env_builder: NeonEnvBuilder):

    # Disable background compaction and GC as we don't want it to happen after `get_physical_size` request
    # and before checking the expected size on disk, which makes the assertion failed
-    neon_env_builder.pageserver_init_overrides = "tenant_config={checkpoint_distance=100000, compaction_period='0s', gc_period='0s', pitr_interval='1s'}"
+    neon_env_builder.pageserver_config_override = "tenant_config={checkpoint_distance=100000, compaction_period='0s', gc_period='0s', pitr_interval='1s'}"

    env = neon_env_builder.init_start()
    pageserver_http = env.pageserver.http_client()
@@ -704,7 +704,7 @@ def test_ondemand_activation(neon_env_builder: NeonEnvBuilder):

    # We will run with the limit set to 1, so that once we have one tenant stuck
    # in a pausable failpoint, the rest are prevented from proceeding through warmup.
-    neon_env_builder.pageserver_init_overrides = "concurrent_tenant_warmup = '1'"
+    neon_env_builder.pageserver_config_override = "concurrent_tenant_warmup = '1'"

    env = neon_env_builder.init_start()
    pageserver_http = env.pageserver.http_client()
@@ -958,7 +958,7 @@ def test_timeline_logical_size_task_priority(neon_env_builder: NeonEnvBuilder):


 def test_eager_attach_does_not_queue_up(neon_env_builder: NeonEnvBuilder):
-    neon_env_builder.pageserver_init_overrides = "concurrent_tenant_warmup = '1'"
+    neon_env_builder.pageserver_config_override = "concurrent_tenant_warmup = '1'"

    env = neon_env_builder.init_start()

@@ -1036,7 +1036,7 @@ def test_eager_attach_does_not_queue_up(neon_env_builder: NeonEnvBuilder):
@pytest.mark.parametrize("activation_method", ["endpoint", "branch", "delete"])
 def test_lazy_attach_activation(neon_env_builder: NeonEnvBuilder, activation_method: str):
    # env.initial_tenant will take up this permit when attaching with lazy because of a failpoint activated after restart
-    neon_env_builder.pageserver_init_overrides = "concurrent_tenant_warmup = '1'"
+    neon_env_builder.pageserver_config_override = "concurrent_tenant_warmup = '1'"

    env = neon_env_builder.init_start()

--- a/test_runner/regress/test_wal_receiver.py
+++ b/test_runner/regress/test_wal_receiver.py
@@ -9,7 +9,7 @@ from fixtures.types import Lsn, TenantId
 # Ensures that walreceiver does not run without any data inserted and only starts after the insertion.
 def test_pageserver_lsn_wait_error_start(neon_env_builder: NeonEnvBuilder):
    # Trigger WAL wait timeout faster
-    neon_env_builder.pageserver_init_overrides = "wait_lsn_timeout = '1s'"
+    neon_env_builder.pageserver_config_override = "wait_lsn_timeout = '1s'"
    env = neon_env_builder.init_start()
    env.pageserver.http_client()

@@ -42,7 +42,7 @@ def test_pageserver_lsn_wait_error_start(neon_env_builder: NeonEnvBuilder):
 # Kills one of the safekeepers and ensures that only the active ones are printed in the state.
 def test_pageserver_lsn_wait_error_safekeeper_stop(neon_env_builder: NeonEnvBuilder):
    # Trigger WAL wait timeout faster
-    neon_env_builder.pageserver_init_overrides = """
+    neon_env_builder.pageserver_config_override = """
        wait_lsn_timeout = "1s"
        tenant_config={walreceiver_connect_timeout = "2s", lagging_wal_timeout = "2s"}
    """