From e2d57fb61b203f54cbcb4d279e5f00914544a7bb Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Wed, 12 Jun 2024 21:11:43 +0200 Subject: [PATCH] Revert "make sure the getpage requests happens" This reverts commit a62b2e3e762677a13d8078019ac9af963978ff25. --- pageserver/src/tenant/timeline.rs | 4 ++-- test_runner/regress/test_vm_bits.py | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index 74c4f6572e..f113740ab7 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -883,8 +883,8 @@ impl Timeline { match cached_lsn.cmp(&lsn) { Ordering::Less => {} // there might be WAL between cached_lsn and lsn, we need to check Ordering::Equal => { - // MATERIALIZED_PAGE_CACHE_HIT_DIRECT.inc(); - // return Ok(cached_img); // exact LSN match, return the image + MATERIALIZED_PAGE_CACHE_HIT_DIRECT.inc(); + return Ok(cached_img); // exact LSN match, return the image } Ordering::Greater => { unreachable!("the returned lsn should never be after the requested lsn") diff --git a/test_runner/regress/test_vm_bits.py b/test_runner/regress/test_vm_bits.py index 50f04ae6b4..6c762f3871 100644 --- a/test_runner/regress/test_vm_bits.py +++ b/test_runner/regress/test_vm_bits.py @@ -292,18 +292,6 @@ def test_vm_bit_clear_on_heap_lock_blackbox(neon_env_builder: NeonEnvBuilder): # already truncated away. # # ERROR: could not access status of transaction 1027 - - # the select() below fails occassionally at get_impl="vectored" validation - - env.pageserver.stop() - env.pageserver.start() - time.sleep(2) - env.pageserver.http_client().patch_tenant_config_client_side(tenant_id, {"test_vm_bit_debug_logging": True}, {}) - endpoint.stop(mode="immediate") - endpoint.start() - pg_conn = endpoint.connect() - cur = pg_conn.cursor() - # cur.execute("select clear_buffer_cache()") cur.execute("select xmin, xmax, * from vmtest_lock where id = 40000 for update") tup = cur.fetchall() log.info(f"tuple = {tup}")