gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-07-27 08:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: include deployment ID in admin info (#3083)

Browse Source 
* fix: include deployment ID in admin info

* test(ecstore): avoid mutating global deployment id
This commit is contained in:
安正超
2026-05-25 22:23:35 +08:00
committed by GitHub
parent 3d2449872a
commit 0d0a17bb36
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/admin_server_info.rs
+20 -2
View File
@@ -17,7 +17,7 @@ use crate::error::{Error, Result};
use crate::rpc::{TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client};
use crate::{
disk::endpoint::Endpoint,
global::{GLOBAL_BOOT_TIME, GLOBAL_Endpoints},
global::{GLOBAL_BOOT_TIME, GLOBAL_Endpoints, get_global_deployment_id},
new_object_layer_fn,
notification_sys::get_global_notification_sys,
store_api::StorageAPI,
@@ -291,7 +291,7 @@ pub async fn get_server_info(get_pools: bool) -> InfoMessage {
domain: None,
region: None,
sqs_arn: None,
deployment_id: None,
deployment_id: get_global_deployment_id(),
buckets: Some(buckets),
objects: Some(objects),
versions: Some(versions),
@@ -393,3 +393,21 @@ pub fn get_commit_id() -> String {
format!("{}@{}", build::COMMIT_DATE_3339, ver)
}
#[cfg(test)]
mod tests {
use serial_test::serial;
use crate::global::get_global_deployment_id;
use super::get_server_info;
#[serial]
#[tokio::test]
async fn server_info_includes_global_deployment_id() {
let expected_deployment_id = get_global_deployment_id();
let info = get_server_info(false).await;
assert_eq!(info.deployment_id, expected_deployment_id);
}
}