rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-16 04:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: test_pageserver_metrics_removed_after_detach[debug-pg14-noop]'

Browse Source 
last_flush_lsn_upload obviously doesn't work with NOOP storage kind

but we need the on-disk state at that lsn, so, wait for on-disk
consistent in that case
This commit is contained in:
Christian Schwarz
2023-06-07 15:04:55 +02:00
parent a97b21ab13
commit abb4112a28
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test_runner/fixtures/neon_fixtures.py
View File

@@ -3064,6 +3064,21 @@ def fork_at_current_lsn(
return env.neon_cli.create_branch(new_branch_name, ancestor_branch_name, tenant_id, current_lsn)
def last_flush_lsn_checkpoint(
env: NeonEnv, endpoint: Endpoint, tenant_id: TenantId, timeline_id: TimelineId
) -> Lsn:
"""
Wait for pageserver to catch to the latest flush LSN of given endpoint, then
checkpoint pageserver.
"""
last_flush_lsn = wait_for_last_flush_lsn(env, endpoint, tenant_id, timeline_id)
ps_http = env.pageserver.http_client()
wait_for_last_record_lsn(ps_http, tenant_id, timeline_id, last_flush_lsn)
# force a checkpoint to trigger upload
ps_http.timeline_checkpoint(tenant_id, timeline_id)
return last_flush_lsn
def last_flush_lsn_upload(
env: NeonEnv, endpoint: Endpoint, tenant_id: TenantId, timeline_id: TimelineId
) -> Lsn:
@@ -3072,10 +3087,7 @@ def last_flush_lsn_upload(
checkpoint pageserver, and wait for it to be uploaded (remote_consistent_lsn
reaching flush LSN).
"""
last_flush_lsn = wait_for_last_flush_lsn(env, endpoint, tenant_id, timeline_id)
last_flush_lsn = last_flush_lsn_checkpoint(env, endpoint, tenant_id, timeline_id)
ps_http = env.pageserver.http_client()
wait_for_last_record_lsn(ps_http, tenant_id, timeline_id, last_flush_lsn)
# force a checkpoint to trigger upload
ps_http.timeline_checkpoint(tenant_id, timeline_id)
wait_for_upload(ps_http, tenant_id, timeline_id, last_flush_lsn)
return last_flush_lsn

6
test_runner/regress/test_tenants.py
View File

@@ -20,6 +20,7 @@ from fixtures.neon_fixtures import (
NeonEnvBuilder,
RemoteStorageKind,
available_remote_storages,
last_flush_lsn_checkpoint,
last_flush_lsn_upload,
)
from fixtures.types import Lsn, TenantId, TimelineId
@@ -275,7 +276,10 @@ def test_pageserver_metrics_removed_after_detach(
cur.execute("INSERT INTO t SELECT generate_series(1,100000), 'payload'")
cur.execute("SELECT sum(key) FROM t")
assert cur.fetchone() == (5000050000,)
last_flush_lsn_upload(env, endpoint, endpoint.tenant_id, timeline_id)
if remote_storage_kind != RemoteStorageKind.NOOP:
last_flush_lsn_upload(env, endpoint, endpoint.tenant_id, timeline_id)
else:
last_flush_lsn_checkpoint(env, endpoint, endpoint.tenant_id, timeline_id)
endpoint.stop()
def get_ps_metric_samples_for_tenant(tenant_id: TenantId) -> List[Sample]: