sdgoij/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-01-17 09:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase main

Browse Source 
Signed-off-by: mujunxiang <1948535941@qq.com>
This commit is contained in:
mujunxiang
2024-11-30 16:05:02 +08:00
parent 1f2cb78b9d
commit 68799ad044
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/protos/src/generated/proto_gen/node_service.rs
View File

@@ -1037,7 +1037,6 @@ pub struct LoadRebalanceMetaResponse {
}
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct LoadTransitionTierConfigRequest {}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LoadTransitionTierConfigResponse {
#[prost(bool, tag = "1")]

13
ecstore/src/heal/heal_ops.rs
View File

@@ -217,14 +217,10 @@ impl HealSequence {
}
impl HealSequence {
pub fn get_scanned_items_count(&self) -> usize {
self.scanned_items_map.values().sum()
async fn _get_scanned_items_count(&self) -> usize {
pub async fn get_scanned_items_count(&self) -> usize {
self.scanned_items_map.read().await.values().sum()
}
pub fn _get_scanned_items_map(&self) -> ItemsMap {
self.scanned_items_map.clone()
async fn _get_scanned_items_map(&self) -> ItemsMap {
self.scanned_items_map.read().await.clone()
}
@@ -419,12 +415,7 @@ impl HealSequence {
async fn heal_rustfs_sys_meta(h: Arc<HealSequence>, meta_prefix: &str) -> Result<()> {
info!("heal_rustfs_sys_meta, h: {:?}", h);
let layer = new_object_layer_fn();
let lock = layer.read().await;
let store = match lock.as_ref() {
Some(s) => s,
None => return Err(Error::from(S3Error::with_message(S3ErrorCode::InternalError, "Not init".to_string()))),
};
let Some(store) = new_object_layer_fn() else { return Err(Error::msg("errServerNotInitialized")) };
let setting = h.setting;
store
.heal_objects(RUSTFS_META_BUCKET, meta_prefix, &setting, h.clone(), true)

2
madmin/src/heal_command.rs
View File

@@ -47,7 +47,7 @@ pub async fn get_local_background_heal_status() -> (BgHealState, bool) {
}
let bg_seq = bg_seq.unwrap();
let mut status = BgHealState {
scanned_items_count: bg_seq.read().await.get_scanned_items_count() as u64,
scanned_items_count: bg_seq.get_scanned_items_count().await as u64,
..Default::default()
};
let mut heal_disks_map = HashSet::new();

2
rustfs/src/admin/mod.rs
View File

@@ -9,7 +9,7 @@ use s3s::route::S3Route;
const ADMIN_PREFIX: &str = "/rustfs/admin";
pub async fn make_admin_route() -> Result<impl S3Route> {
pub fn make_admin_route() -> Result<impl S3Route> {
let mut r = S3Router::new();
r.insert(Method::POST, "/", AdminOperation(&handlers::AssumeRoleHandle {}))?;