sdgoij/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-03-17 14:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

update s3s 0.14.0-dev (#2070)

Browse Source 
Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
唐小鸭
2026-03-04 01:07:24 +08:00
committed by GitHub
parent f4b523c236
commit f89cdfe5b3
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@@ -8164,9 +8164,8 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
[[package]] [[package]]
name = "s3s" name = "s3s"
version = "0.13.0" version = "0.14.0-dev"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/s3s-project/s3s?rev=2fa67f48764a0d80f304304d34c3f978e0fdacf5#2fa67f48764a0d80f304304d34c3f978e0fdacf5"
checksum = "fcf5572ca9bae5fd92d4e5a3e934c73793ab743bcbc761cd5e86a622c2a5e98a"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"arrayvec", "arrayvec",

2
Cargo.toml
View File

@@ -235,7 +235,7 @@ rumqttc = { version = "0.25.1" }
rustix = { version = "1.1.4", features = ["fs"] } rustix = { version = "1.1.4", features = ["fs"] }
rust-embed = { version = "8.11.0" } rust-embed = { version = "8.11.0" }
rustc-hash = { version = "2.1.1" } rustc-hash = { version = "2.1.1" }
s3s = { version = "0.13.0", features = ["minio"] } s3s = { git = "https://github.com/s3s-project/s3s", rev = "2fa67f48764a0d80f304304d34c3f978e0fdacf5", features = ["minio"] }
serial_test = "3.4.0" serial_test = "3.4.0"
shadow-rs = { version = "1.7.0", default-features = false } shadow-rs = { version = "1.7.0", default-features = false }
siphasher = "1.0.2" siphasher = "1.0.2"

4
crates/obs/src/telemetry/otel.rs
View File

@@ -51,7 +51,7 @@ use opentelemetry_sdk::{
}; };
use rustfs_config::{ use rustfs_config::{
APP_NAME, DEFAULT_OBS_LOG_STDOUT_ENABLED, DEFAULT_OBS_LOGS_EXPORT_ENABLED, DEFAULT_OBS_METRICS_EXPORT_ENABLED, APP_NAME, DEFAULT_OBS_LOG_STDOUT_ENABLED, DEFAULT_OBS_LOGS_EXPORT_ENABLED, DEFAULT_OBS_METRICS_EXPORT_ENABLED,
DEFAULT_OBS_PROFILING_EXPORT_ENABLED, DEFAULT_OBS_TRACES_EXPORT_ENABLED, METER_INTERVAL, SAMPLE_RATIO, DEFAULT_OBS_TRACES_EXPORT_ENABLED, METER_INTERVAL, SAMPLE_RATIO,
}; };
use std::{io::IsTerminal, time::Duration}; use std::{io::IsTerminal, time::Duration};
use tracing::info; use tracing::info;
@@ -324,7 +324,7 @@ fn init_profiler(config: &OtelConfig) -> Option<pyroscope::PyroscopeAgent<pyrosc
if !config if !config
.profiling_export_enabled .profiling_export_enabled
.unwrap_or(DEFAULT_OBS_PROFILING_EXPORT_ENABLED) .unwrap_or(rustfs_config::DEFAULT_OBS_PROFILING_EXPORT_ENABLED)
{ {
return None; return None;
} }

1
rustfs/src/app/multipart_usecase.rs
View File

@@ -916,6 +916,7 @@ impl DefaultMultipartUsecase {
let (src_bucket, src_key, src_version_id) = match copy_source { let (src_bucket, src_key, src_version_id) = match copy_source {
CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)), CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Bucket { CopySource::Bucket {
bucket: ref src_bucket, bucket: ref src_bucket,
key: ref src_key, key: ref src_key,

1
rustfs/src/app/object_usecase.rs
View File

@@ -1962,6 +1962,7 @@ impl DefaultObjectUsecase {
} = req.input.clone(); } = req.input.clone();
let (src_bucket, src_key, version_id) = match copy_source { let (src_bucket, src_key, version_id) = match copy_source {
CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)), CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Bucket { CopySource::Bucket {
ref bucket, ref bucket,
ref key, ref key,

1
rustfs/src/storage/access.rs
View File

@@ -431,6 +431,7 @@ impl S3Access for FS {
{ {
let (src_bucket, src_key, version_id) = match &req.input.copy_source { let (src_bucket, src_key, version_id) = match &req.input.copy_source {
CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)), CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)),
CopySource::Bucket { bucket, key, version_id } => { CopySource::Bucket { bucket, key, version_id } => {
(bucket.to_string(), key.to_string(), version_id.as_ref().map(|v| v.to_string())) (bucket.to_string(), key.to_string(), version_id.as_ref().map(|v| v.to_string()))
} }