mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-24 13:16:28 +00:00
todo file_info_from_raw
This commit is contained in:
@@ -19,7 +19,7 @@ impl VersioningApi for VersioningConfiguration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn prefix_enabled(&self, prefix: &str) -> bool {
|
fn prefix_enabled(&self, prefix: &str) -> bool {
|
||||||
if self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)) {
|
if self.status != Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ impl LocalDisk {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// read xl.meta raw data
|
/// read xl.meta raw data
|
||||||
|
#[tracing::instrument(level = "debug", skip(self, volume_dir, path))]
|
||||||
async fn read_raw(
|
async fn read_raw(
|
||||||
&self,
|
&self,
|
||||||
bucket: &str,
|
bucket: &str,
|
||||||
@@ -460,6 +461,7 @@ impl LocalDisk {
|
|||||||
Ok(data)
|
Ok(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(level = "debug", skip(self, volume_dir, file_path))]
|
||||||
async fn read_all_data_with_dmtime(
|
async fn read_all_data_with_dmtime(
|
||||||
&self,
|
&self,
|
||||||
volume: &str,
|
volume: &str,
|
||||||
|
|||||||
@@ -277,6 +277,7 @@ impl DiskAPI for Disk {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(level = "debug", skip(self))]
|
||||||
async fn read_version(
|
async fn read_version(
|
||||||
&self,
|
&self,
|
||||||
_org_volume: &str,
|
_org_volume: &str,
|
||||||
|
|||||||
@@ -273,6 +273,7 @@ struct DelObj {
|
|||||||
|
|
||||||
#[async_trait::async_trait]
|
#[async_trait::async_trait]
|
||||||
impl ObjectIO for Sets {
|
impl ObjectIO for Sets {
|
||||||
|
#[tracing::instrument(level = "debug", skip(self))]
|
||||||
async fn get_object_reader(
|
async fn get_object_reader(
|
||||||
&self,
|
&self,
|
||||||
bucket: &str,
|
bucket: &str,
|
||||||
@@ -285,6 +286,7 @@ impl ObjectIO for Sets {
|
|||||||
.get_object_reader(bucket, object, range, h, opts)
|
.get_object_reader(bucket, object, range, h, opts)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
#[tracing::instrument(level = "debug", skip(self, data))]
|
||||||
async fn put_object(&self, bucket: &str, object: &str, data: &mut PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo> {
|
async fn put_object(&self, bucket: &str, object: &str, data: &mut PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo> {
|
||||||
self.get_disks_by_key(object).put_object(bucket, object, data, opts).await
|
self.get_disks_by_key(object).put_object(bucket, object, data, opts).await
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1083,6 +1083,7 @@ impl ObjectIO for ECStore {
|
|||||||
.get_object_reader(bucket, object.as_str(), range, h, &opts)
|
.get_object_reader(bucket, object.as_str(), range, h, &opts)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
#[tracing::instrument(level = "debug", skip(self, data))]
|
||||||
async fn put_object(&self, bucket: &str, object: &str, data: &mut PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo> {
|
async fn put_object(&self, bucket: &str, object: &str, data: &mut PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo> {
|
||||||
check_put_object_args(bucket, object)?;
|
check_put_object_args(bucket, object)?;
|
||||||
|
|
||||||
|
|||||||
@@ -303,14 +303,21 @@ impl S3 for FS {
|
|||||||
let range = HTTPRangeSpec::nil();
|
let range = HTTPRangeSpec::nil();
|
||||||
|
|
||||||
let h = HeaderMap::new();
|
let h = HeaderMap::new();
|
||||||
let opts = &ObjectOptions::default();
|
|
||||||
|
let metadata = extract_metadata(&req.headers);
|
||||||
|
|
||||||
|
let opts: ObjectOptions = put_opts(&bucket, &key, None, &req.headers, Some(metadata))
|
||||||
|
.await
|
||||||
|
.map_err(to_s3_error)?;
|
||||||
|
|
||||||
|
error!("get_object ObjectOptions {:?}", &opts);
|
||||||
|
|
||||||
let Some(store) = new_object_layer_fn() else {
|
let Some(store) = new_object_layer_fn() else {
|
||||||
return Err(S3Error::with_message(S3ErrorCode::InternalError, "Not init".to_string()));
|
return Err(S3Error::with_message(S3ErrorCode::InternalError, "Not init".to_string()));
|
||||||
};
|
};
|
||||||
|
|
||||||
let reader = store
|
let reader = store
|
||||||
.get_object_reader(bucket.as_str(), key.as_str(), range, h, opts)
|
.get_object_reader(bucket.as_str(), key.as_str(), range, h, &opts)
|
||||||
.await
|
.await
|
||||||
.map_err(to_s3_error)?;
|
.map_err(to_s3_error)?;
|
||||||
|
|
||||||
@@ -574,6 +581,8 @@ impl S3 for FS {
|
|||||||
.await
|
.await
|
||||||
.map_err(to_s3_error)?;
|
.map_err(to_s3_error)?;
|
||||||
|
|
||||||
|
error!("ObjectOptions {:?}", opts);
|
||||||
|
|
||||||
let obj_info = store
|
let obj_info = store
|
||||||
.put_object(&bucket, &key, &mut reader, &opts)
|
.put_object(&bucket, &key, &mut reader, &opts)
|
||||||
.await
|
.await
|
||||||
|
|||||||
Reference in New Issue
Block a user