gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-12 16:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(observability): avoid cgroup path allocation (#5711)

Browse Source 
* perf(observability): avoid cgroup path allocation

Co-Authored-By: heihutu <heihutu@gmail.com>

* test(e2e): satisfy regression test clippy

Co-Authored-By: heihutu <heihutu@gmail.com>

---------

Co-authored-by: heihutu <heihutu@gmail.com>
This commit is contained in:
houseme
2026-08-05 01:47:07 +08:00
committed by GitHub
parent 15c2bade5f
commit 3dabac4a09
9 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/e2e_test/src/bucket_stats_regression_test.rs
+14 -15
View File
@@ -32,7 +32,6 @@
#[cfg(test)]
mod tests {
use crate::common::{RustFSTestEnvironment, awscurl_get, init_logging};
use aws_sdk_s3::Client;
use aws_sdk_s3::primitives::ByteStream;
use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
use rustfs_data_usage::DataUsageInfo;
@@ -92,13 +91,13 @@ mod tests {
for attempt in 0..18 {
sleep(Duration::from_secs(5)).await;
if let Ok(usage) = get_data_usage(&env).await {
if let Some(bucket_usage) = usage.buckets_usage.get(bucket) {
info!(" attempt {attempt}: objectsCount = {}", bucket_usage.objects_count);
if bucket_usage.objects_count >= 10 {
found_nonzero = true;
break;
}
if let Ok(usage) = get_data_usage(&env).await
&& let Some(bucket_usage) = usage.buckets_usage.get(bucket)
{
info!(" attempt {attempt}: objectsCount = {}", bucket_usage.objects_count);
if bucket_usage.objects_count >= 10 {
found_nonzero = true;
break;
}
}
}
@@ -160,13 +159,13 @@ mod tests {
for attempt in 0..18 {
sleep(Duration::from_secs(5)).await;
if let Ok(usage) = get_data_usage(&env).await {
if let Some(bucket_usage) = usage.buckets_usage.get(bucket) {
info!(" attempt {attempt}: objectsCount = {}", bucket_usage.objects_count);
if bucket_usage.objects_count == 0 {
found_zero = true;
break;
}
if let Ok(usage) = get_data_usage(&env).await
&& let Some(bucket_usage) = usage.buckets_usage.get(bucket)
{
info!(" attempt {attempt}: objectsCount = {}", bucket_usage.objects_count);
if bucket_usage.objects_count == 0 {
found_zero = true;
break;
}
}
}
crates/e2e_test/src/delete_regression_test.rs
+12 -5
View File
@@ -31,7 +31,6 @@
#[cfg(test)]
mod tests {
use crate::common::{RustFSTestEnvironment, init_logging};
use aws_sdk_s3::Client;
use aws_sdk_s3::primitives::ByteStream;
use aws_sdk_s3::types::{BucketVersioningStatus, Delete, ObjectIdentifier, VersioningConfiguration};
use serial_test::serial;
@@ -85,8 +84,13 @@ mod tests {
.await
.expect("list objects before delete");
let keys: Vec<_> = list.contents().iter().map(|o| o.key().unwrap_or("")).collect();
assert!(keys.contains(&"to-delete.txt"), "RT-05 FAIL: object not in LIST before delete");
assert!(
list.contents()
.iter()
.map(|o| o.key().unwrap_or(""))
.any(|key| key == "to-delete.txt"),
"RT-05 FAIL: object not in LIST before delete"
);
// DELETE
client
@@ -105,9 +109,12 @@ mod tests {
.await
.expect("list objects after delete");
let keys: Vec<_> = list.contents().iter().map(|o| o.key().unwrap_or("")).collect();
assert!(
!keys.contains(&"to-delete.txt"),
!list
.contents()
.iter()
.map(|o| o.key().unwrap_or(""))
.any(|key| key == "to-delete.txt"),
"RT-05 FAIL: deleted object still in LIST (regression rustfs#5375)"
);
crates/e2e_test/src/distributed_startup_regression_test.rs
+2 -2
View File
@@ -34,8 +34,8 @@ mod tests {
use aws_sdk_s3::primitives::ByteStream;
use serial_test::serial;
use std::error::Error;
use tokio::time::{Duration, sleep, timeout};
use tracing::{info, warn};
use tokio::time::{Duration, sleep};
use tracing::info;
type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
crates/e2e_test/src/lifecycle_regression_test.rs
+1 -2
View File
@@ -38,8 +38,7 @@ mod tests {
};
use serial_test::serial;
use std::error::Error;
use tokio::time::{Duration, sleep, timeout};
use tracing::{info, warn};
use tracing::info;
type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
crates/e2e_test/src/listing_regression_test.rs
-1
View File
@@ -30,7 +30,6 @@
#[cfg(test)]
mod tests {
use crate::common::{RustFSTestEnvironment, init_logging};
use aws_sdk_s3::Client;
use aws_sdk_s3::primitives::ByteStream;
use serial_test::serial;
use std::collections::HashSet;
crates/e2e_test/src/notification_startup_regression_test.rs
-1
View File
@@ -31,7 +31,6 @@
#[cfg(test)]
mod tests {
use crate::common::{RustFSTestEnvironment, init_logging};
use aws_sdk_s3::Client;
use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
use serial_test::serial;
use std::error::Error;
crates/e2e_test/src/tier_transition_regression_test.rs
+1 -4
View File
@@ -29,13 +29,10 @@
#[cfg(test)]
mod tests {
use crate::common::{RustFSTestEnvironment, admin_ok, init_logging};
use aws_sdk_s3::Client;
use aws_sdk_s3::primitives::ByteStream;
use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
use serde_json::Value;
use serial_test::serial;
use std::error::Error;
use tracing::{info, warn};
use tracing::info;
type TestResult = Result<(), Box<dyn Error + Send + Sync>>;