Merge remote-tracking branch 'origin/main' into overtrue/release-1.0.0-rc.2

crates/log-analyzer/src/rules/seed/heal.rs

@@ -103,11 +103,7 @@ pub(super) fn rules() -> Vec<Rule> {
                 P2Degraded,
                 "heal",
                 "heal 任务调度/执行失败",
-                any([
+                any([prefix("Heal task timeout"), prefix("Heal task execution failed")]),
-                    prefix("Heal task timeout"),
-                    prefix("Heal task execution failed"),
-                    contains("Heal manager is not running"),
-                ]),
                 "heal 任务调度/执行层故障。",
                 "检查 heal 后台服务状态与资源压力。",
             )

rustfs/src/storage/sse.rs

@@ -4565,11 +4565,9 @@ mod tests {
         })
         .await
         .expect_err("mismatched kms context should fail");
-        assert!(
+        assert_eq!(err.code, S3ErrorCode::InternalError);
-            err.message.contains("context") || err.message.contains("Context"),
+        assert_eq!(err.message, ApiError::error_code_to_message(&S3ErrorCode::InternalError));
-            "unexpected error for mismatched kms context: {}",
+        assert_eq!(super::kms_data_plane_error_class(&err), "context_mismatch");
-            err.message
-        );
 
         manager.stop().await.expect("kms service should stop cleanly");
         reset_sse_dek_provider();