rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-10-20 02:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore aux files ingest and listing in basebackup for one tenant.

Browse Source 
As one off hack to make it run right now.
This commit is contained in:
Arseny Sher
2024-02-22 09:50:14 +03:00
parent 01180666b0
commit 9c662e65a2
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pageserver/src/basebackup.rs
+19 -13
View File
@@ -13,6 +13,7 @@
use anyhow::{anyhow, bail, ensure, Context};
use bytes::{BufMut, Bytes, BytesMut};
use fail::fail_point;
use hex::FromHex;
use pageserver_api::key::{key_to_slru_block, Key};
use postgres_ffi::pg_constants;
use std::fmt::Write as FmtWrite;
@@ -308,20 +309,25 @@ where
}
}
for (path, content) in self.timeline.list_aux_files(self.lsn, self.ctx).await? {
if path.starts_with("pg_replslot") {
let offs = pg_constants::REPL_SLOT_ON_DISK_OFFSETOF_RESTART_LSN;
let restart_lsn = Lsn(u64::from_le_bytes(
content[offs..offs + 8].try_into().unwrap(),
));
info!("Replication slot {} restart LSN={}", path, restart_lsn);
min_restart_lsn = Lsn::min(min_restart_lsn, restart_lsn);
// one-off hack: disable listing aux files for this tenant
if self.timeline.tenant_shard_id.tenant_id
!= utils::id::TenantId::from_hex("94dfb564f25964764b19763f337730ce").unwrap()
{
for (path, content) in self.timeline.list_aux_files(self.lsn, self.ctx).await? {
if path.starts_with("pg_replslot") {
let offs = pg_constants::REPL_SLOT_ON_DISK_OFFSETOF_RESTART_LSN;
let restart_lsn = Lsn(u64::from_le_bytes(
content[offs..offs + 8].try_into().unwrap(),
));
info!("Replication slot {} restart LSN={}", path, restart_lsn);
min_restart_lsn = Lsn::min(min_restart_lsn, restart_lsn);
}
let header = new_tar_header(&path, content.len() as u64)?;
self.ar
.append(&header, &*content)
.await
.context("could not add aux file to basebackup tarball")?;
}
let header = new_tar_header(&path, content.len() as u64)?;
self.ar
.append(&header, &*content)
.await
.context("could not add aux file to basebackup tarball")?;
}
}
if min_restart_lsn != Lsn::MAX {
pageserver/src/walingest.rs
+8 -1
View File
@@ -28,6 +28,7 @@ use postgres_ffi::{fsm_logical_to_physical, page_is_new, page_set_lsn};
use anyhow::{bail, Context, Result};
use bytes::{Buf, Bytes, BytesMut};
use hex::FromHex;
use tracing::*;
use utils::failpoint_support;
@@ -356,7 +357,13 @@ impl WalIngest {
// a particular string, for example, but this is enough for now.
failpoint_support::sleep_millis_async!("wal-ingest-logical-message-sleep");
} else if let Some(path) = prefix.strip_prefix("neon-file:") {
modification.put_file(path, message, ctx).await?;
// one off hack: disable aux file ingestion for this tenant
if modification.tline.tenant_shard_id.tenant_id
!= utils::id::TenantId::from_hex("94dfb564f25964764b19763f337730ce")
.unwrap()
{
modification.put_file(path, message, ctx).await?;
}
}
}
}