mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-18 10:43:15 +00:00
8b233cdd94
fix(ecstore): keep O_DIRECT for eligible reads via native io_uring (rustfs/backlog#1102)
Wire ecstore's io_uring read backend to rustfs-uring's native aligned
O_DIRECT read (`read_at_direct`, merged in rustfs/uring#3), so an
O_DIRECT-eligible read keeps BOTH io_uring's async submission AND
O_DIRECT's page-cache bypass instead of trading one for the other.
`UringBackend::pread_bytes` now selects the read shape by a tiered,
per-disk-latched ladder — never a blanket downgrade:
1. io_uring latched off for this disk (backlog#1101) -> StdBackend.
2. O_DIRECT-eligible + native path usable -> pread_uring_direct: open
the file O_DIRECT, probe the device alignment once (cached), and
read via read_at_direct. Best path: async + no cache pollution.
3. O_DIRECT-eligible but the fs refused O_DIRECT earlier (latched)
-> StdBackend aligned path (which itself degrades to buffered).
4. non-O_DIRECT read -> buffered pread_uring.
Latching keeps a failure from being re-attempted per-read: an fs that
refuses O_DIRECT (EINVAL/EOPNOTSUPP on open) latches the native direct
path off for that disk; a restriction-class errno from the read latches
io_uring off wholesale (backlog#1101). Any other error falls back for
that one read without masking a genuine data problem as a permanent
downgrade. The alignment comes from the existing probe_direct_io_align
(statx STATX_DIOALIGN, default 4096) and is cached in a per-disk
OnceLock so the probe runs at most once.
This replaces the interim guard that routed every O_DIRECT-eligible read
to StdBackend (which disabled io_uring on the hottest shard reads); the
native path is now the default and StdBackend is only a fallback tier.
Bumps the rustfs-uring pin to the merged #3 commit.
Verified on a real Linux host (16-core, real io_uring + O_DIRECT):
cargo check --tests, clippy -D warnings, and disk::local tests all pass
(128 passed, 0 failed), including uring_preserves_o_direct_for_eligible_reads
across unaligned ranges.
Co-authored-by: heihutu <heihutu@gmail.com>
183 lines
6.0 KiB
TOML
183 lines
6.0 KiB
TOML
# Copyright 2024 RustFS Team
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
[package]
|
|
name = "rustfs-ecstore"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
repository.workspace = true
|
|
rust-version.workspace = true
|
|
homepage.workspace = true
|
|
description = "Erasure coding storage backend for RustFS, providing efficient data storage and retrieval with redundancy."
|
|
keywords = ["erasure-coding", "storage", "rustfs", "Minio", "solomon"]
|
|
categories = ["web-programming", "development-tools", "filesystem"]
|
|
documentation = "https://docs.rs/rustfs-ecstore/latest/rustfs_ecstore/"
|
|
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
default = []
|
|
rio-v2 = ["dep:rustfs-rio-v2"]
|
|
hotpath = ["dep:hotpath", "hotpath/hotpath", "rustfs-filemeta/hotpath", "rustfs-rio/hotpath"]
|
|
|
|
[dependencies]
|
|
hotpath = { workspace = true, optional = true }
|
|
rustfs-filemeta.workspace = true
|
|
rustfs-utils = { workspace = true, features = ["full"] }
|
|
rustfs-rio.workspace = true
|
|
rustfs-rio-v2 = { workspace = true, optional = true }
|
|
rustfs-signer.workspace = true
|
|
rustfs-storage-api.workspace = true
|
|
rustfs-tls-runtime.workspace = true
|
|
rustfs-checksums.workspace = true
|
|
rustfs-config = { workspace = true, features = ["constants", "notify", "audit", "server-config-model"] }
|
|
rustfs-concurrency.workspace = true
|
|
rustfs-credentials = { workspace = true }
|
|
rustfs-common.workspace = true
|
|
rustfs-policy.workspace = true
|
|
rustfs-protos.workspace = true
|
|
rustfs-replication.workspace = true
|
|
rustfs-lifecycle.workspace = true
|
|
rustfs-kms.workspace = true
|
|
rustfs-s3-types = { workspace = true }
|
|
rustfs-data-usage.workspace = true
|
|
rustfs-object-capacity.workspace = true
|
|
async-trait.workspace = true
|
|
bytes.workspace = true
|
|
byteorder = { workspace = true }
|
|
chrono.workspace = true
|
|
glob = { workspace = true }
|
|
thiserror.workspace = true
|
|
flatbuffers.workspace = true
|
|
futures.workspace = true
|
|
futures-util.workspace = true
|
|
tracing.workspace = true
|
|
tracing-opentelemetry.workspace = true
|
|
serde.workspace = true
|
|
time.workspace = true
|
|
bytesize.workspace = true
|
|
serde_json.workspace = true
|
|
quick-xml = { workspace = true, features = ["serialize", "async-tokio"] }
|
|
s3s.workspace = true
|
|
http.workspace = true
|
|
opentelemetry.workspace = true
|
|
http-body = { workspace = true }
|
|
http-body-util.workspace = true
|
|
url.workspace = true
|
|
uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
|
|
reed-solomon-erasure = { workspace = true }
|
|
reed-solomon-simd = { workspace = true }
|
|
lazy_static.workspace = true
|
|
moka = { workspace = true }
|
|
rustfs-lock.workspace = true
|
|
rustfs-io-metrics.workspace = true
|
|
regex = { workspace = true }
|
|
path-absolutize = { workspace = true }
|
|
rmp.workspace = true
|
|
rmp-serde.workspace = true
|
|
tokio-util = { workspace = true, features = ["io", "compat"] }
|
|
base64 = { workspace = true }
|
|
hmac = { workspace = true }
|
|
sha1 = { workspace = true }
|
|
sha2 = { workspace = true }
|
|
hex-simd = { workspace = true }
|
|
tempfile.workspace = true
|
|
hyper.workspace = true
|
|
hyper-util.workspace = true
|
|
hyper-rustls.workspace = true
|
|
rustls.workspace = true
|
|
rustls-pki-types.workspace = true
|
|
tokio = { workspace = true, features = ["io-util", "sync", "signal"] }
|
|
tonic.workspace = true
|
|
xxhash-rust = { workspace = true, features = ["xxh64", "xxh3"] }
|
|
tower.workspace = true
|
|
async-channel.workspace = true
|
|
enumset = { workspace = true }
|
|
num_cpus = { workspace = true }
|
|
rand.workspace = true
|
|
pin-project-lite.workspace = true
|
|
md-5.workspace = true
|
|
memmap2 = { workspace = true }
|
|
libc.workspace = true
|
|
rustix = { workspace = true }
|
|
rustfs-madmin.workspace = true
|
|
reqwest = { workspace = true }
|
|
aes-gcm.workspace = true
|
|
chacha20poly1305.workspace = true
|
|
aws-sdk-s3 = { workspace = true }
|
|
urlencoding = { workspace = true }
|
|
smallvec = { workspace = true }
|
|
shadow-rs.workspace = true
|
|
async-recursion.workspace = true
|
|
aws-credential-types = { workspace = true }
|
|
aws-smithy-types = { workspace = true }
|
|
aws-smithy-runtime-api = { workspace = true }
|
|
parking_lot = { workspace = true }
|
|
base64-simd.workspace = true
|
|
serde_urlencoded.workspace = true
|
|
google-cloud-storage = { workspace = true }
|
|
google-cloud-auth = { workspace = true }
|
|
aws-config = { workspace = true }
|
|
faster-hex = { workspace = true }
|
|
ratelimit = { workspace = true }
|
|
aws-smithy-http-client.workspace = true
|
|
|
|
# Observability and Metrics
|
|
metrics = { workspace = true }
|
|
|
|
# Runtime-probed io_uring read backend (backlog#1104). Linux-only, git
|
|
# dependency until rustfs-uring is production-ready and published. The guard
|
|
# scripts/check_no_tokio_io_uring.sh allows an explicit io-uring integration;
|
|
# only the tokio "io-uring" runtime feature is banned.
|
|
[target.'cfg(target_os = "linux")'.dependencies]
|
|
rustfs-uring = { git = "https://github.com/rustfs/uring", rev = "f577ba0bfd6c3d74f9bdc54b573b8fcb45d6bc22" }
|
|
|
|
[dev-dependencies]
|
|
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "test-util"] }
|
|
criterion = { workspace = true, features = ["html_reports"] }
|
|
temp-env = { workspace = true, features = ["async_closure"] }
|
|
tracing-subscriber = { workspace = true, features = ["json"] }
|
|
serial_test = { workspace = true }
|
|
opentelemetry_sdk = { workspace = true }
|
|
proptest = "1"
|
|
rcgen.workspace = true
|
|
insta = { workspace = true }
|
|
rustfs-crypto = { workspace = true }
|
|
|
|
[build-dependencies]
|
|
shadow-rs = { workspace = true, features = ["build", "metadata"] }
|
|
|
|
[[bench]]
|
|
name = "erasure_benchmark"
|
|
harness = false
|
|
|
|
[[bench]]
|
|
name = "comparison_benchmark"
|
|
harness = false
|
|
|
|
[[bench]]
|
|
name = "rename_data_meta_benchmark"
|
|
harness = false
|
|
|
|
[[bench]]
|
|
name = "single_block_non_inline_benchmark"
|
|
harness = false
|
|
|
|
[lib]
|
|
doctest = false
|