From c29199515c0ba432a8931834a1f4eb7f81cdf155 Mon Sep 17 00:00:00 2001
From: weisd <weishidavip@163.com>
Date: Fri, 4 Oct 2024 23:32:07 +0800
Subject: [PATCH] test bucketmetadata_sys

---
 ecstore/src/bucket/metadata_sys.rs |  5 +++++
 ecstore/src/bucket/mod.rs          |  2 +-
 ecstore/src/store.rs               | 25 +++----------------------
 rustfs/src/storage/ecfs.rs         |  1 -
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/ecstore/src/bucket/metadata_sys.rs b/ecstore/src/bucket/metadata_sys.rs
index 05a60f8f4..a73c08c61 100644
--- a/ecstore/src/bucket/metadata_sys.rs
+++ b/ecstore/src/bucket/metadata_sys.rs
@@ -31,6 +31,11 @@ pub async fn get_bucket_metadata_sys() -> Arc<RwLock<BucketMetadataSys>> {
     GLOBAL_BucketMetadataSys.clone()
 }
 
+pub async fn bucket_metadata_sys_set(bucket: &str, bm: BucketMetadata) {
+    let sys = GLOBAL_BucketMetadataSys.write().await;
+    sys.set(bucket, bm).await
+}
+
 #[derive(Debug, Default)]
 pub struct BucketMetadataSys {
     metadata_map: RwLock<HashMap<String, BucketMetadata>>,
diff --git a/ecstore/src/bucket/mod.rs b/ecstore/src/bucket/mod.rs
index 9be464946..b1f0a6d8a 100644
--- a/ecstore/src/bucket/mod.rs
+++ b/ecstore/src/bucket/mod.rs
@@ -13,4 +13,4 @@ mod target;
 pub mod utils;
 mod versioning;
 
-pub use metadata_sys::{get_bucket_metadata_sys, init_bucket_metadata_sys};
+pub use metadata_sys::{bucket_metadata_sys_set, get_bucket_metadata_sys, init_bucket_metadata_sys};
diff --git a/ecstore/src/store.rs b/ecstore/src/store.rs
index 772d87e94..321740e3a 100644
--- a/ecstore/src/store.rs
+++ b/ecstore/src/store.rs
@@ -1,11 +1,12 @@
 #![allow(clippy::map_entry)]
+use crate::bucket::bucket_metadata_sys_set;
 use crate::disk::endpoint::EndpointType;
 use crate::global::{is_dist_erasure, set_object_layer, GLOBAL_LOCAL_DISK_MAP, GLOBAL_LOCAL_DISK_SET_DRIVES};
 use crate::store_api::ObjectIO;
 use crate::{
     bucket::metadata::BucketMetadata,
     disk::{error::DiskError, new_disk, DiskOption, DiskStore, WalkDirOptions, BUCKET_META_PREFIX, RUSTFS_META_BUCKET},
-    endpoints::{EndpointServerPools, SetupType},
+    endpoints::EndpointServerPools,
     error::{Error, Result},
     peer::S3PeerSys,
     sets::Sets,
@@ -21,7 +22,6 @@ use backon::{ExponentialBuilder, Retryable};
 use common::globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Host, GLOBAL_Rustfs_Port};
 use futures::future::join_all;
 use http::HeaderMap;
-use s3s::{dto::StreamingBlob, Body};
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
@@ -509,27 +509,8 @@ impl StorageAPI for ECStore {
 
         let mut meta = BucketMetadata::new(bucket);
         meta.save(self).await?;
-        // let data = meta.marshal_msg()?;
-        // let file_path = meta.save_file_path();
 
-        // // TODO: wrap hash reader
-
-        // let content_len = data.len();
-
-        // let body = Body::from(data);
-
-        // let reader = PutObjReader::new(StreamingBlob::from(body), content_len);
-
-        // self.put_object(
-        //     RUSTFS_META_BUCKET,
-        //     &file_path,
-        //     reader,
-        //     &ObjectOptions {
-        //         max_parity: true,
-        //         ..Default::default()
-        //     },
-        // )
-        // .await?;
+        bucket_metadata_sys_set(bucket, meta).await;
 
         // TODO: toObjectErr
 
diff --git a/rustfs/src/storage/ecfs.rs b/rustfs/src/storage/ecfs.rs
index b701404bb..dd1855f38 100644
--- a/rustfs/src/storage/ecfs.rs
+++ b/rustfs/src/storage/ecfs.rs
@@ -1,6 +1,5 @@
 use bytes::BufMut;
 use bytes::Bytes;
-use ecstore::bucket::get_bucket_metadata_sys;
 use ecstore::bucket_meta::BucketMetadata;
 use ecstore::disk::error::DiskError;
 use ecstore::disk::RUSTFS_META_BUCKET;