refactor: prune edge compat aliases (#3692)

This commit is contained in:
安正超
2026-06-21 17:41:07 +08:00
committed by GitHub
parent 9d510e9d5b
commit 30b46640b4
7 changed files with 196 additions and 36 deletions
+22 -8
View File
@@ -13,7 +13,9 @@
// limitations under the License.
use rustfs_config::server_config::Config;
use rustfs_ecstore::api::{config, global};
use std::sync::Arc;
type NotifyStore = rustfs_ecstore::api::storage::ECStore;
#[derive(Debug)]
pub(crate) enum NotifyConfigStoreError {
@@ -26,21 +28,33 @@ pub(crate) async fn update_server_config<F>(mut modifier: F) -> Result<Option<Co
where
F: FnMut(&mut Config) -> bool,
{
let Some(store) = global::resolve_object_store_handle() else {
let Some(store) = resolve_notify_object_store_handle() else {
return Err(NotifyConfigStoreError::StorageNotAvailable);
};
let mut new_config = config::com::read_config_without_migrate(store.clone())
.await
.map_err(|err| NotifyConfigStoreError::Read(err.to_string()))?;
let mut new_config = read_notify_server_config_without_migrate(store.clone()).await?;
if !modifier(&mut new_config) {
return Ok(None);
}
config::com::save_server_config(store, &new_config)
.await
.map_err(|err| NotifyConfigStoreError::Save(err.to_string()))?;
save_notify_server_config(store, &new_config).await?;
Ok(Some(new_config))
}
fn resolve_notify_object_store_handle() -> Option<Arc<NotifyStore>> {
rustfs_ecstore::api::global::resolve_object_store_handle()
}
async fn read_notify_server_config_without_migrate(store: Arc<NotifyStore>) -> Result<Config, NotifyConfigStoreError> {
rustfs_ecstore::api::config::com::read_config_without_migrate(store)
.await
.map_err(|err| NotifyConfigStoreError::Read(err.to_string()))
}
async fn save_notify_server_config(store: Arc<NotifyStore>, config: &Config) -> Result<(), NotifyConfigStoreError> {
rustfs_ecstore::api::config::com::save_server_config(store, config)
.await
.map_err(|err| NotifyConfigStoreError::Save(err.to_string()))
}