fix(ci): restore workspace lint compatibility (#6460)

This commit is contained in:
houseme
2026-08-23 22:35:43 +08:00
committed by GitHub
parent 3ce01dcc73
commit 201c653dcd
8 changed files with 56 additions and 53 deletions
+21 -27
View File
@@ -117,13 +117,13 @@ async fn pause_duplicate_admission_after_active_lock(request_id: &str) {
type WorkloadSnapshotProviderRef = Arc<dyn WorkloadAdmissionSnapshotProvider + Send + Sync>;
#[derive(Debug, Clone, PartialEq, Eq)]
struct MrfRepairNoticeTarget {
bucket: Arc<str>,
object: Arc<str>,
version_id: Option<[u8; 16]>,
kind: rustfs_common::mrf_channel::MrfKind,
scope: Option<rustfs_common::mrf_channel::MrfScope>,
lease: Option<rustfs_common::mrf_channel::MrfIngressLease>,
pub(super) struct MrfRepairNoticeTarget {
pub(super) bucket: Arc<str>,
pub(super) object: Arc<str>,
pub(super) version_id: Option<[u8; 16]>,
pub(super) kind: rustfs_common::mrf_channel::MrfKind,
pub(super) scope: Option<rustfs_common::mrf_channel::MrfScope>,
pub(super) lease: Option<rustfs_common::mrf_channel::MrfIngressLease>,
}
#[derive(Debug, Clone)]
@@ -1400,35 +1400,29 @@ impl HealManager {
HealType::ECDecode { .. } => rustfs_common::mrf_channel::MrfKind::DecodeFailure,
_ => rustfs_common::mrf_channel::MrfKind::PartialWrite,
};
self.submit_mrf_heal_request_with_receipt_and_identity(request, bucket, object, version_id, kind, None, None)
.await
}
pub(crate) async fn submit_mrf_heal_request_with_receipt_and_identity(
&self,
request: HealRequest,
bucket: Arc<str>,
object: Arc<str>,
version_id: Option<[u8; 16]>,
kind: rustfs_common::mrf_channel::MrfKind,
scope: Option<rustfs_common::mrf_channel::MrfScope>,
lease: Option<rustfs_common::mrf_channel::MrfIngressLease>,
) -> Result<HealAdmissionReceipt> {
self.submit_heal_request_with_receipt_alias_and_mrf_notice(
self.submit_mrf_heal_request_with_receipt_and_identity(
request,
true,
Some(MrfRepairNoticeTarget {
MrfRepairNoticeTarget {
bucket,
object,
version_id,
kind,
scope,
lease,
}),
scope: None,
lease: None,
},
)
.await
}
pub(super) async fn submit_mrf_heal_request_with_receipt_and_identity(
&self,
request: HealRequest,
mrf_notice_target: MrfRepairNoticeTarget,
) -> Result<HealAdmissionReceipt> {
self.submit_heal_request_with_receipt_alias_and_mrf_notice(request, true, Some(mrf_notice_target))
.await
}
async fn submit_heal_request_with_receipt_alias_and_mrf_notice(
&self,
request: HealRequest,
+9 -7
View File
@@ -33,7 +33,7 @@
//! than waiting for the failed-object TTL to re-scan the path.
use super::{DiskStore, HealDiskExt as _, local_disk_map_read};
use crate::heal::manager::HealManager;
use crate::heal::manager::{HealManager, MrfRepairNoticeTarget};
use metrics::{counter, gauge};
use rustfs_common::heal_channel::{HealAdmissionDropReason, HealAdmissionResult};
use rustfs_common::mrf_channel::{MRF_MAX_ATTEMPTS, MrfIntent};
@@ -491,12 +491,14 @@ async fn submit_mrf_heal_request(manager: &HealManager, intent: &MrfIntent) -> c
let receipt = manager
.submit_mrf_heal_request_with_receipt_and_identity(
build_heal_request(intent),
intent.bucket.clone(),
intent.object.clone(),
intent.version_id,
intent.kind,
intent.scope,
intent.lease,
MrfRepairNoticeTarget {
bucket: intent.bucket.clone(),
object: intent.object.clone(),
version_id: intent.version_id,
kind: intent.kind,
scope: intent.scope,
lease: intent.lease,
},
)
.await?;
Ok(receipt.result)
+1
View File
@@ -127,6 +127,7 @@ const SFTP_COMPRESSION: &[russh::compression::Name] = &[russh::compression::NONE
fn build_preferred() -> russh::Preferred {
russh::Preferred {
kex: Cow::Borrowed(SFTP_KEX),
host_key_certificates: Cow::Borrowed(&[]),
key: Cow::Borrowed(SFTP_HOST_KEY_ALGORITHMS),
cipher: Cow::Borrowed(SFTP_CIPHERS),
mac: Cow::Borrowed(SFTP_MACS),
@@ -167,7 +167,7 @@ fn stale_quota_uses_complete_baseline_plus_positive_deltas() {
let (observed, _) = observational_data_usage_info(&[current], &expected, &all_buckets, &[], TEST_PLAN_DIGEST, 8, 3)
.expect("complete set data is a valid observational baseline");
assert_eq!(observed.objects_total_size, 30);
assert_eq!(observed.usage_snapshot_set_states[0].complete, true);
assert!(observed.usage_snapshot_set_states[0].complete);
}
#[test]