fix tests

Signed-off-by: Alex Chi Z <[email protected]>

Author: skyzh

test_runner/regress/test_attach_tenant_config.py

@@ -194,7 +194,6 @@ def test_fully_custom_config(positive_env: NeonEnv):
             "numerator": 0,
             "denominator": 10,
         },
-        "rel_size_v1_access_disabled": True,
     }
 
     vps_http = env.storage_controller.pageserver_api()

test_runner/regress/test_compaction.py

@@ -12,10 +12,12 @@
 from fixtures.neon_fixtures import (
     NeonEnvBuilder,
     generate_uploads_and_deletions,
+    wait_for_last_flush_lsn,
 )
 from fixtures.pageserver.http import PageserverApiException
 from fixtures.utils import skip_in_debug_build, wait_until
 from fixtures.workload import Workload
+from regress.test_pg_regress import patch_tenant_conf
 
 AGGRESSIVE_COMPACTION_TENANT_CONF = {
     # Disable gc and compaction. The test runs compaction manually.
@@ -1101,7 +1103,8 @@ def test_image_consistent_lsn(neon_env_builder: NeonEnvBuilder):
     neon_env_builder.num_pageservers = 2
     neon_env_builder.num_safekeepers = 1
     env = neon_env_builder.init_start(
-        initial_tenant_conf=tenant_conf,
+        # We have to run this test with v1 to avoid v2 migration producing too many delta layers.
+        initial_tenant_conf=patch_tenant_conf(tenant_conf, "v1"),
         initial_tenant_shard_count=4,
         initial_tenant_shard_stripe_size=1,
     )
@@ -1116,6 +1119,8 @@ def test_image_consistent_lsn(neon_env_builder: NeonEnvBuilder):
             f"INSERT INTO foo (id, val) VALUES ({v}, repeat('abcde{v:0>3}', 500))", log_query=False
         )
 
+    wait_for_last_flush_lsn(env, endpoint, env.initial_tenant, env.initial_timeline)
+
     response = env.storage_controller.tenant_timeline_describe(tenant_id, timeline_id)
     shards = response["shards"]
     for shard in shards:

test_runner/regress/test_compatibility.py

@@ -585,6 +585,12 @@ def test_historic_storage_formats(
             dataset.tenant_id,
             {"rel_size_v1_access_disabled": True, "rel_size_v2_enabled": True},
         )
+        for timeline in timelines:
+            env.pageserver.http_client().timeline_patch_index_part(
+                dataset.tenant_id,
+                timeline["timeline_id"],
+                {"force_index_update": True, "rel_size_migration": "migrated"},
+            )
 
     # Import tenant does not create the timeline on safekeepers,
     # because it is a debug handler and the timeline may have already been