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

Merge branch 'problame/async-cleanup-on-drop-for-writers' into yuchen/direct-io-delta-image-layer-write

Browse Source
This commit is contained in:
Christian Schwarz
2025-04-11 17:46:46 +02:00
parent c6209b4a39 2f0677be26
commit 3388eb1205
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/tenant/storage_layer/delta_layer.rs
View File

@@ -297,17 +297,15 @@ impl DeltaLayer {
key_start: Key,
lsn_range: &Range<Lsn>,
) -> Utf8PathBuf {
// Strongly monotonically increasing suffix number.
//
// Use this over random string to avoid corruption bugs.
// It's unlikely the number will verflow since it is reset after pageserver restarts.
// Never reuse a filename in the lifetime of a pageserver process so that we need
// not worry about laggard Drop impl's async unlink hitting an already reused filename.
static NEXT_TEMP_DISAMBIGUATOR: AtomicU64 = AtomicU64::new(1);
let filename_disambiguator =
NEXT_TEMP_DISAMBIGUATOR.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
conf.timeline_path(tenant_shard_id, timeline_id)
.join(format!(
"{}-XXX__{:016X}-{:016X}.{:X}.{}",
"{}-XXX__{:016X}-{:016X}.{:x}.{}",
key_start,
u64::from(lsn_range.start),
u64::from(lsn_range.end),

13
pageserver/src/tenant/storage_layer/image_layer.rs
View File

@@ -261,17 +261,15 @@ impl ImageLayer {
tenant_shard_id: TenantShardId,
fname: &ImageLayerName,
) -> Utf8PathBuf {
// Strongly monotonically increasing suffix number.
//
// Use this over random string to avoid corruption bugs.
// It's unlikely the number will verflow since it is reset after pageserver restarts.
// Never reuse a filename in the lifetime of a pageserver process so that we need
// not worry about laggard Drop impl's async unlink hitting an already reused filename.
static NEXT_TEMP_DISAMBIGUATOR: AtomicU64 = AtomicU64::new(1);
let filename_disambiguator =
NEXT_TEMP_DISAMBIGUATOR.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
conf.timeline_path(&tenant_shard_id, &timeline_id)
.join(format!(
"{fname}.{:X}.{TEMP_FILE_SUFFIX}",
"{fname}.{:x}.{TEMP_FILE_SUFFIX}",
filename_disambiguator
))
}
@@ -752,10 +750,10 @@ struct ImageLayerWriterInner {
blob_writer: BlobWriter,
tree: DiskBtreeBuilder<BlockBuf, KEY_SIZE>,
_gate_guard: utils::sync::gate::GateGuard,
#[cfg(feature = "testing")]
last_written_key: Key,
_gate_guard: utils::sync::gate::GateGuard,
}
impl ImageLayerWriterInner {
@@ -827,7 +825,6 @@ impl ImageLayerWriterInner {
num_keys: 0,
#[cfg(feature = "testing")]
last_written_key: Key::MIN,
_gate_guard: gate.enter()?,
};