rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-16 09:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply the hack for all timelines of the target tenant

Browse Source 
This gives us more flexibility to try it on a branch first
This commit is contained in:
Heikki Linnakangas
2024-01-20 19:26:53 +02:00
committed by Stas Kelvich
parent 65cd16de86
commit 12e39001ce
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pageserver/src/walingest.rs
View File

@@ -50,7 +50,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 {
@@ -149,7 +149,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()
{

2
test_runner/regress/test_next_xid.py
View File

@@ -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)