test: use aux file v2 policy in benchmarks (#8174)

Use aux file v2 in benchmarks.

Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2024-06-26 16:33:15 -04:00
committed by GitHub
parent c39d5b03e8
commit 04b2ac3fed
2 changed files with 7 additions and 8 deletions

View File

@@ -581,7 +581,7 @@ class NeonEnvBuilder:
timeline_id=env.initial_timeline, timeline_id=env.initial_timeline,
shard_count=initial_tenant_shard_count, shard_count=initial_tenant_shard_count,
shard_stripe_size=initial_tenant_shard_stripe_size, shard_stripe_size=initial_tenant_shard_stripe_size,
aux_file_v2=self.pageserver_aux_file_policy, aux_file_policy=self.pageserver_aux_file_policy,
) )
assert env.initial_tenant == initial_tenant assert env.initial_tenant == initial_tenant
assert env.initial_timeline == initial_timeline assert env.initial_timeline == initial_timeline
@@ -1604,7 +1604,7 @@ class NeonCli(AbstractNeonCli):
shard_stripe_size: Optional[int] = None, shard_stripe_size: Optional[int] = None,
placement_policy: Optional[str] = None, placement_policy: Optional[str] = None,
set_default: bool = False, set_default: bool = False,
aux_file_v2: Optional[AuxFileStore] = None, aux_file_policy: Optional[AuxFileStore] = None,
) -> Tuple[TenantId, TimelineId]: ) -> Tuple[TenantId, TimelineId]:
""" """
Creates a new tenant, returns its id and its initial timeline's id. Creates a new tenant, returns its id and its initial timeline's id.
@@ -1629,13 +1629,11 @@ class NeonCli(AbstractNeonCli):
) )
) )
if aux_file_v2 is AuxFileStore.V2: if aux_file_policy is AuxFileStore.V2:
args.extend(["-c", "switch_aux_file_policy:v2"]) args.extend(["-c", "switch_aux_file_policy:v2"])
elif aux_file_policy is AuxFileStore.V1:
if aux_file_v2 is AuxFileStore.V1:
args.extend(["-c", "switch_aux_file_policy:v1"]) args.extend(["-c", "switch_aux_file_policy:v1"])
elif aux_file_policy is AuxFileStore.CrossValidation:
if aux_file_v2 is AuxFileStore.CrossValidation:
args.extend(["-c", "switch_aux_file_policy:cross-validation"]) args.extend(["-c", "switch_aux_file_policy:cross-validation"])
if set_default: if set_default:

View File

@@ -2,9 +2,10 @@ import time
import pytest import pytest
from fixtures.log_helper import log from fixtures.log_helper import log
from fixtures.neon_fixtures import NeonEnv, PgBin, logical_replication_sync from fixtures.neon_fixtures import AuxFileStore, NeonEnv, PgBin, logical_replication_sync
@pytest.mark.parametrize("pageserver_aux_file_policy", [AuxFileStore.V2])
@pytest.mark.timeout(1000) @pytest.mark.timeout(1000)
def test_logical_replication(neon_simple_env: NeonEnv, pg_bin: PgBin, vanilla_pg): def test_logical_replication(neon_simple_env: NeonEnv, pg_bin: PgBin, vanilla_pg):
env = neon_simple_env env = neon_simple_env