many_tenants: fix: waiting for all tenants to become active doesn't work with 20k tenants

While at it, also remove the returning of template_timeline and tenants
from the many_tenants return type. It wasn't correctly rehydrated
anyway.
This commit is contained in:
Christian Schwarz
2024-01-09 16:15:14 +00:00
parent 8c855f4e1f
commit 77efb8b58b
3 changed files with 51 additions and 20 deletions

View File

@@ -61,11 +61,7 @@ def test_getpage_throughput(
zenbenchmark: NeonBenchmarker,
pg_bin: PgBin,
):
env, template_timeline, tenants = (
getpage_throughput_fixture.env,
getpage_throughput_fixture.timeline_id,
getpage_throughput_fixture.tenants,
)
env = getpage_throughput_fixture.env
ps_http = env.pageserver.http_client()
# run the benchmark with one client per timeline, each doing 10k requests to random keys.
@@ -80,7 +76,8 @@ def test_getpage_throughput(
"--runtime",
duration,
# "--per-target-rate-limit", "50",
*[f"{tenant}/{template_timeline}" for tenant in tenants],
# don't specify the targets, our fixture prepares us exactly 20k tenants,
# and pagebench will auto-discover them
]
log.info(f"command: {' '.join(cmd)}")
basepath = pg_bin.run_capture(cmd, with_command_header=False)