mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-22 04:16:38 +00:00
Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics
# Conflicts: # Cargo.toml # iam/src/manager.rs # iam/src/store/object.rs # rustfs/src/admin/handlers/sts.rs # rustfs/src/main.rs # rustfs/src/storage/ecfs.rs
This commit is contained in:
+2
-2
@@ -94,7 +94,7 @@ where
|
||||
self.clone().save_iam_formatter().await?;
|
||||
self.clone().load().await?;
|
||||
|
||||
// The background thread enables scheduled updates or receives signal updates
|
||||
// Background thread starts periodic updates or receives signal updates
|
||||
tokio::spawn({
|
||||
let s = Arc::clone(&self);
|
||||
async move {
|
||||
@@ -142,7 +142,7 @@ where
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// todo,Check whether it exists and whether it can be retried
|
||||
// TODO: Check if exists, whether retry is possible
|
||||
#[tracing::instrument(level = "debug", skip(self))]
|
||||
async fn save_iam_formatter(self: Arc<Self>) -> Result<()> {
|
||||
let path = get_iam_format_file_path();
|
||||
|
||||
Reference in New Issue
Block a user