From 93e136a03c2c6269e87ddd747ae873c3afea21c1 Mon Sep 17 00:00:00 2001 From: Thang Pham Date: Tue, 5 Jul 2022 09:51:18 -0400 Subject: [PATCH] update PITR --- pageserver/src/layered_repository.rs | 2 +- test_runner/batch_others/test_branch_and_gc.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pageserver/src/layered_repository.rs b/pageserver/src/layered_repository.rs index 7dfe2a10e5..dd6fc4a314 100644 --- a/pageserver/src/layered_repository.rs +++ b/pageserver/src/layered_repository.rs @@ -2190,7 +2190,7 @@ impl LayeredTimeline { // Calculate pitr cutoff point. // If we cannot determine a cutoff LSN, be conservative and don't GC anything. - let mut pitr_cutoff_lsn = cutoff; + let mut pitr_cutoff_lsn = *self.get_latest_gc_cutoff_lsn(); if let Ok(timeline) = tenant_mgr::get_local_timeline_with_load(self.tenant_id, self.timeline_id) diff --git a/test_runner/batch_others/test_branch_and_gc.py b/test_runner/batch_others/test_branch_and_gc.py index 52a8e17b2d..df573758ec 100644 --- a/test_runner/batch_others/test_branch_and_gc.py +++ b/test_runner/batch_others/test_branch_and_gc.py @@ -59,6 +59,9 @@ def test_branch_and_gc(neon_simple_env: NeonEnv): 'compaction_period': '1 s', 'compaction_threshold': '2', 'image_creation_threshold': '1', + + # set PITR interval to be small, so we can do GC + 'pitr_interval': '1 s' }) timeline_main = env.neon_cli.create_timeline(f'test_main', tenant_id=tenant)