From 34e69cfc9348a2939695e86d8369e3c21e8ea9c7 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Wed, 29 Nov 2023 16:32:55 +0000 Subject: [PATCH] fixup previous commit --- pageserver/src/tenant/storage_layer/delta_layer.rs | 13 +++++++------ pageserver/src/tenant/storage_layer/image_layer.rs | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs index dc5e9e33af..4d13ade5ac 100644 --- a/pageserver/src/tenant/storage_layer/delta_layer.rs +++ b/pageserver/src/tenant/storage_layer/delta_layer.rs @@ -634,12 +634,13 @@ impl DeltaLayer { where F: Fn(Summary) -> Summary, { - let file = VirtualFile::open_with_options( - path, - &*std::fs::OpenOptions::new().read(true).write(true), - ) - .await - .with_context(|| format!("Failed to open file '{}'", path))?; + let file = { + let mut options = tokio_epoll_uring::ops::open_at::OpenOptions::new(); + options.read(true).write(true); + VirtualFile::open_with_options_async(path, options) + .await + .with_context(|| format!("Failed to open file '{}'", path))? + }; let file = FileBlockReader::new(file); let summary_blk = file.read_blk(0, ctx).await?; let actual_summary = Summary::des_prefix(summary_blk.as_ref()).context("deserialize")?; diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs index c638064f9b..2394c0a25d 100644 --- a/pageserver/src/tenant/storage_layer/image_layer.rs +++ b/pageserver/src/tenant/storage_layer/image_layer.rs @@ -319,12 +319,13 @@ impl ImageLayer { where F: Fn(Summary) -> Summary, { - let file = VirtualFile::open_with_options( - path, - &*std::fs::OpenOptions::new().read(true).write(true), - ) - .await - .with_context(|| format!("Failed to open file '{}'", path))?; + let file = { + let mut options = tokio_epoll_uring::ops::open_at::OpenOptions::new(); + options.read(true).write(true); + VirtualFile::open_with_options_async(path, options) + .await + .with_context(|| format!("Failed to open file '{}'", path))? + }; let file = FileBlockReader::new(file); let summary_blk = file.read_blk(0, ctx).await?; let actual_summary = Summary::des_prefix(summary_blk.as_ref()).context("deserialize")?;