diff --git a/pageserver/src/walingest.rs b/pageserver/src/walingest.rs index 3a27d6effe..6584f721c2 100644 --- a/pageserver/src/walingest.rs +++ b/pageserver/src/walingest.rs @@ -49,7 +49,7 @@ use postgres_ffi::v14::xlog_utils::*; use postgres_ffi::v14::{bindings::FullTransactionId, CheckPoint}; use postgres_ffi::TransactionId; use postgres_ffi::BLCKSZ; -use utils::id::{TenantId, TimelineId}; +use utils::id::TenantId; use utils::lsn::Lsn; pub struct WalIngest { @@ -148,7 +148,6 @@ impl WalIngest { if self.checkpoint.nextXid.value == 4294968320 && // 1::1024, the incorrect value modification.tline.tenant_shard_id.tenant_id == TenantId::from_hex("df254570a4f603805528b46b0d45a76c").unwrap() && - modification.tline.timeline_id == TimelineId::from_hex("e592ec1cc0e5a41f69060d0c9efb07ed").unwrap() && lsn < Lsn::from_str("35A/E32D9000").unwrap() && !reintroduce_bug_failpoint_activated() { diff --git a/test_runner/regress/test_next_xid.py b/test_runner/regress/test_next_xid.py index 681216063c..8334e609b5 100644 --- a/test_runner/regress/test_next_xid.py +++ b/test_runner/regress/test_next_xid.py @@ -272,7 +272,7 @@ def test_one_off_hack_for_nextxid_bug( branch_name = "import_from_vanilla" # This is the tenant/timeline that the one-off hack targets tenant = "df254570a4f603805528b46b0d45a76c" - timeline = "e592ec1cc0e5a41f69060d0c9efb07ed" + timeline = TimelineId.generate() env.pageserver.tenant_create(tenant)