From 973409e2d7b94722e07d8867ef179c8b1b0279d5 Mon Sep 17 00:00:00 2001 From: Cuong Nguyen Date: Thu, 30 Nov 2023 02:00:04 -0500 Subject: [PATCH] Fix wrong begin lsn in import_wal --- pageserver/src/import_datadir.rs | 4 ++-- test_runner/regress/test_attach_tenant_config.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pageserver/src/import_datadir.rs b/pageserver/src/import_datadir.rs index 6e7ad61d7b..5bcf607f53 100644 --- a/pageserver/src/import_datadir.rs +++ b/pageserver/src/import_datadir.rs @@ -312,7 +312,7 @@ async fn import_wal( waldecoder.feed_bytes(&buf); let mut nrecords = 0; - let mut modification = tline.begin_modification(endpoint); + let mut modification = tline.begin_modification(last_lsn); let mut decoded = DecodedWALRecord::default(); while last_lsn <= endpoint { if let Some((lsn, recdata)) = waldecoder.poll_decode()? { @@ -448,7 +448,7 @@ pub async fn import_wal_from_tar( waldecoder.feed_bytes(&bytes[offset..]); - let mut modification = tline.begin_modification(end_lsn); + let mut modification = tline.begin_modification(last_lsn); let mut decoded = DecodedWALRecord::default(); while last_lsn <= end_lsn { if let Some((lsn, recdata)) = waldecoder.poll_decode()? { diff --git a/test_runner/regress/test_attach_tenant_config.py b/test_runner/regress/test_attach_tenant_config.py index e8f2d6a1a4..d2bd53d8aa 100644 --- a/test_runner/regress/test_attach_tenant_config.py +++ b/test_runner/regress/test_attach_tenant_config.py @@ -171,7 +171,6 @@ def test_fully_custom_config(positive_env: NeonEnv): "min_resident_size_override": 23, "trace_read_requests": True, "walreceiver_connect_timeout": "13m", - "ingest_batch_size": 100, } ps_http = env.pageserver.http_client()