mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-29 08:27:06 +00:00
2ebf8bc138
* refactor(ecstore): drop the client shim, import rustfs-s3-client directly Completes the migration window opened by the rustfs-s3-client extraction (rustfs/backlog#1842 PR3): every consumer now imports the client crate directly and the crate::client shim is deleted. - All in-crate crate::client:: paths (tier warm backends, tier core, lifecycle tier_sweeper, replication storage boundary, set_disk) now import rustfs_s3_client::* directly; crates/ecstore/src/client/mod.rs and the lib.rs mod client declaration are gone. - The two server-side modules historically misfiled under client/ move to their real homes: object_api_utils.rs to crates/ecstore/src/object_api/ (it builds engine-side object readers/writers), and object_handlers_common.rs to crates/ecstore/src/bucket/lifecycle/ (it is the lifecycle noncurrent-version cleanup helper). The latter now routes its replication calls through the lifecycle replication_sink boundary (schedule_delete wrapper and the sink's ReplicationObjectBridge re-export), as the lifecycle guard requires. - The ecstore public facade drops api::client: object_api_utils is exposed as api::object_api_utils, and the rustfs crate takes admin_handler_utils (AdminError) from rustfs-s3-client directly (new dependency). - Guard updates: the migration guard no longer pins mod client in ecstore's lib.rs or the admin_handler_utils facade module (it pins the new api::object_api_utils facade instead), and the module-lint register follows object_api_utils.rs to its new path. Verification: cargo check -p rustfs-ecstore --all-targets and -p rustfs; cargo fmt --all; tier/transition/lifecycle-focused nextest (626 passed) and the decommission/rebalance/heal families in a filtered run (603 passed; the full-suite parallel run only fails on this machine's known decommission/rebalance baseline flakes, which pass in filtered reruns and fail identically on pristine origin/main); layer/migration/s3s/logging/error-format/doc-path guard scripts all pass. * docs(architecture): record the S3 client extraction and reword invariant 4 (#6669) Closes the documentation step of rustfs/backlog#1842. ARCHITECTURE.md invariant 4 now states the serving-vs-consuming distinction the adversarial ruling asked for: ecstore must not serve HTTP/S3 wire types, while consuming remote S3 endpoints is a legitimate engine capability that lives in the extracted rustfs-s3-client crate. The violation note is updated from the pre-extraction snapshot (58 files, embedded client) to the current ratcheted state (shrink-only S3S_ECSTORE_FILES_BASELINE in scripts/check_s3s_footprint.sh, object_lock converted first), and the crate map gains s3-client. ecstore-module-split-plan.md gets the client-directory entry the plan was missing: a Current Shape row and a completed-extraction section describing the pure-move + shim + direct-import sequence and the re-homing of the two misfiled server-side modules.
155 lines
5.3 KiB
Rust
155 lines
5.3 KiB
Rust
// 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.
|
|
#![allow(unused_imports)]
|
|
#![allow(unused_variables)]
|
|
#![allow(unused_mut)]
|
|
#![allow(unused_assignments)]
|
|
#![allow(unused_must_use)]
|
|
#![allow(clippy::all)]
|
|
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
|
|
use crate::services::tier::{
|
|
tier_config::TierAliyun,
|
|
warm_backend::{WarmBackend, WarmBackendGetOpts, build_transition_put_options},
|
|
warm_backend_s3::WarmBackendS3,
|
|
};
|
|
use rustfs_s3_client::{
|
|
admin_handler_utils::AdminError,
|
|
api_put_object::PutObjectOptions,
|
|
credentials::{Credentials, SignatureType, Static, Value},
|
|
transition_api::{BucketLookupType, Options, ReadCloser, ReaderImpl, TransitionClient, TransitionCore},
|
|
};
|
|
use tracing::warn;
|
|
|
|
const MAX_MULTIPART_PUT_OBJECT_SIZE: i64 = 1024 * 1024 * 1024 * 1024 * 5;
|
|
const MAX_PARTS_COUNT: i64 = 10000;
|
|
const _MAX_PART_SIZE: i64 = 1024 * 1024 * 1024 * 5;
|
|
const MIN_PART_SIZE: i64 = 1024 * 1024 * 128;
|
|
|
|
pub struct WarmBackendAliyun(WarmBackendS3);
|
|
|
|
impl WarmBackendAliyun {
|
|
pub async fn new(conf: &TierAliyun, tier: &str) -> Result<Self, std::io::Error> {
|
|
if conf.access_key == "" || conf.secret_key == "" {
|
|
return Err(std::io::Error::other("both access and secret keys are required"));
|
|
}
|
|
|
|
if conf.bucket == "" {
|
|
return Err(std::io::Error::other("no bucket name was provided"));
|
|
}
|
|
|
|
let u = match url::Url::parse(&conf.endpoint) {
|
|
Ok(u) => u,
|
|
Err(e) => {
|
|
return Err(std::io::Error::other(e.to_string()));
|
|
}
|
|
};
|
|
|
|
let creds = Credentials::new(Static(Value {
|
|
access_key_id: conf.access_key.clone(),
|
|
secret_access_key: conf.secret_key.clone(),
|
|
session_token: "".to_string(),
|
|
signer_type: SignatureType::SignatureV4,
|
|
..Default::default()
|
|
}));
|
|
let opts = Options {
|
|
creds,
|
|
secure: u.scheme() == "https",
|
|
trailing_headers: true,
|
|
region: conf.region.clone(),
|
|
bucket_lookup: BucketLookupType::BucketLookupDNS,
|
|
..Default::default()
|
|
};
|
|
let scheme = u.scheme();
|
|
let default_port = if scheme == "https" { 443 } else { 80 };
|
|
let host = u
|
|
.host_str()
|
|
.ok_or_else(|| std::io::Error::other("Invalid endpoint URL: missing host"))?;
|
|
let client = TransitionClient::new(&format!("{}:{}", host, u.port().unwrap_or(default_port)), opts, "aliyun").await?;
|
|
|
|
let client = Arc::new(client);
|
|
let core = TransitionCore(Arc::clone(&client));
|
|
Ok(Self(WarmBackendS3 {
|
|
client,
|
|
core,
|
|
bucket: conf.bucket.clone(),
|
|
prefix: conf.prefix.strip_suffix("/").unwrap_or(&conf.prefix).to_owned(),
|
|
storage_class: "".to_string(),
|
|
}))
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl WarmBackend for WarmBackendAliyun {
|
|
async fn put_with_meta(
|
|
&self,
|
|
object: &str,
|
|
r: ReaderImpl,
|
|
length: i64,
|
|
meta: HashMap<String, String>,
|
|
) -> Result<String, std::io::Error> {
|
|
let part_size = optimal_part_size(length)?;
|
|
let client = self.0.client.clone();
|
|
let res = client
|
|
.put_object(&self.0.bucket, &self.0.get_dest(object), r, length, &{
|
|
let mut opts = build_transition_put_options(self.0.storage_class.clone(), meta);
|
|
opts.part_size = part_size as u64;
|
|
opts.disable_content_sha256 = true;
|
|
opts
|
|
})
|
|
.await?;
|
|
//self.ToObjectError(err, object)
|
|
Ok(res.version_id)
|
|
}
|
|
|
|
async fn put(&self, object: &str, r: ReaderImpl, length: i64) -> Result<String, std::io::Error> {
|
|
self.put_with_meta(object, r, length, HashMap::new()).await
|
|
}
|
|
|
|
async fn get(&self, object: &str, rv: &str, opts: WarmBackendGetOpts) -> Result<ReadCloser, std::io::Error> {
|
|
self.0.get(object, rv, opts).await
|
|
}
|
|
|
|
async fn remove(&self, object: &str, rv: &str) -> Result<(), std::io::Error> {
|
|
self.0.remove(object, rv).await
|
|
}
|
|
|
|
async fn in_use(&self) -> Result<bool, std::io::Error> {
|
|
self.0.in_use().await
|
|
}
|
|
}
|
|
|
|
fn optimal_part_size(object_size: i64) -> Result<i64, std::io::Error> {
|
|
let mut object_size = object_size;
|
|
if object_size == -1 {
|
|
object_size = MAX_MULTIPART_PUT_OBJECT_SIZE;
|
|
}
|
|
|
|
if object_size > MAX_MULTIPART_PUT_OBJECT_SIZE {
|
|
return Err(std::io::Error::other("entity too large"));
|
|
}
|
|
|
|
let configured_part_size = MIN_PART_SIZE;
|
|
let mut part_size_flt = object_size as f64 / MAX_PARTS_COUNT as f64;
|
|
part_size_flt = (part_size_flt as f64 / configured_part_size as f64).ceil() * configured_part_size as f64;
|
|
|
|
let part_size = part_size_flt as i64;
|
|
if part_size == 0 {
|
|
return Ok(MIN_PART_SIZE);
|
|
}
|
|
Ok(part_size)
|
|
}
|