Revert "experiment(repeat, without preceding reverts) demonstrate that std-fs performs better because it hits the page cache"

This reverts commit d66ccbae5e.
This commit is contained in:
Christian Schwarz
2024-03-13 15:28:24 +00:00
parent d66ccbae5e
commit 644c5e243d
2 changed files with 4 additions and 11 deletions
+3 -10
View File
@@ -1,12 +1,7 @@
//! Enum-dispatch to the `OpenOptions` type of the respective [`super::IoEngineKind`];
use nix::libc::O_DSYNC;
use super::io_engine::IoEngine;
use std::{
os::{fd::OwnedFd, unix::fs::OpenOptionsExt},
path::Path,
};
use std::{os::fd::OwnedFd, path::Path};
#[derive(Debug, Clone)]
pub enum OpenOptions {
@@ -99,14 +94,12 @@ impl OpenOptions {
}
pub(in crate::virtual_file) async fn open(&self, path: &Path) -> std::io::Result<OwnedFd> {
let mut options = self.clone();
options.custom_flags(O_DSYNC); // disk latency
match options {
match self {
OpenOptions::StdFs(x) => x.open(path).map(|file| file.into()),
#[cfg(target_os = "linux")]
OpenOptions::TokioEpollUring(x) => {
let system = tokio_epoll_uring::thread_local_system().await;
system.open(path, &x).await.map_err(|e| match e {
system.open(path, x).await.map_err(|e| match e {
tokio_epoll_uring::Error::Op(e) => e,
tokio_epoll_uring::Error::System(system) => {
std::io::Error::new(std::io::ErrorKind::Other, system)
+1 -1
View File
@@ -200,7 +200,7 @@ def wait_for_last_record_lsn(
lsn: Lsn,
) -> Lsn:
"""waits for pageserver to catch up to a certain lsn, returns the last observed lsn."""
for i in range(10000):
for i in range(100):
current_lsn = last_record_lsn(pageserver_http, tenant, timeline)
if current_lsn >= lsn:
return current_lsn