mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-15 01:23:12 +00:00
Merge remote-tracking branch 'origin/main' into overtrue/release-1.0.0-rc.2
This commit is contained in:
@@ -103,11 +103,7 @@ pub(super) fn rules() -> Vec<Rule> {
|
||||
P2Degraded,
|
||||
"heal",
|
||||
"heal 任务调度/执行失败",
|
||||
any([
|
||||
prefix("Heal task timeout"),
|
||||
prefix("Heal task execution failed"),
|
||||
contains("Heal manager is not running"),
|
||||
]),
|
||||
any([prefix("Heal task timeout"), prefix("Heal task execution failed")]),
|
||||
"heal 任务调度/执行层故障。",
|
||||
"检查 heal 后台服务状态与资源压力。",
|
||||
)
|
||||
|
||||
@@ -4565,11 +4565,9 @@ mod tests {
|
||||
})
|
||||
.await
|
||||
.expect_err("mismatched kms context should fail");
|
||||
assert!(
|
||||
err.message.contains("context") || err.message.contains("Context"),
|
||||
"unexpected error for mismatched kms context: {}",
|
||||
err.message
|
||||
);
|
||||
assert_eq!(err.code, S3ErrorCode::InternalError);
|
||||
assert_eq!(err.message, ApiError::error_code_to_message(&S3ErrorCode::InternalError));
|
||||
assert_eq!(super::kms_data_plane_error_class(&err), "context_mismatch");
|
||||
|
||||
manager.stop().await.expect("kms service should stop cleanly");
|
||||
reset_sse_dek_provider();
|
||||
|
||||
Reference in New Issue
Block a user