diff --git a/test_runner/regress/test_compaction.py b/test_runner/regress/test_compaction.py index b3bccf15f801..bd51088acd6a 100644 --- a/test_runner/regress/test_compaction.py +++ b/test_runner/regress/test_compaction.py @@ -115,6 +115,17 @@ def test_pageserver_compaction_smoke(neon_env_builder: NeonEnvBuilder): assert non_vectored_average < 8 assert vectored_average < 8 + # run a gc-compaction in the end for the rel data range + ps_http.timeline_compact( + tenant_id, + timeline_id, + enhanced_gc_bottom_most_compaction=True, + body={ + "start": "000000000000000000000000000000000000", + "end": "030000000000000000000000000000000000", + }, + ) + # Stripe sizes in number of pages. TINY_STRIPES = 16 @@ -122,19 +133,10 @@ def test_pageserver_compaction_smoke(neon_env_builder: NeonEnvBuilder): @pytest.mark.parametrize( - "shard_count,stripe_size,gc_compaction", - [ - (None, None, False), - (4, TINY_STRIPES, False), - (4, LARGE_STRIPES, False), - (4, LARGE_STRIPES, True), - ], + "shard_count,stripe_size", [(None, None), (4, TINY_STRIPES), (4, LARGE_STRIPES)] ) def test_sharding_compaction( - neon_env_builder: NeonEnvBuilder, - stripe_size: int, - shard_count: Optional[int], - gc_compaction: bool, + neon_env_builder: NeonEnvBuilder, stripe_size: int, shard_count: Optional[int] ): """ Use small stripes, small layers, and small compaction thresholds to exercise how compaction @@ -223,17 +225,6 @@ def test_sharding_compaction( # that at least one of them has some image layers. assert any(shard_has_image_layers) - if gc_compaction: - env.pageserver.http_client().timeline_compact( - tenant_id, - timeline_id, - enhanced_gc_bottom_most_compaction=True, - body={ - "start": "00000000000000000000000000000000", - "end": "30000000000000000000000000000000", - }, - ) - # Assert that everything is still readable workload.validate()