gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-10 06:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(e2e): select G14 replacement drive by evidence

Browse Source 
Choose the replacement disk from the target node by the presence of complete pool metadata instead of assuming the first configured drive is the scanner metadata holder. This keeps the G14 multi-set harness aligned with multi-drive EC layouts and adds clearer diagnostics when multi-pool outage writes fail closed.

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

Co-Authored-By: zhi22915 <qiuzgang@gmail.com>
This commit is contained in:
houseme
2026-09-10 13:04:39 +08:00
parent 0b40d47a8a
commit d4c1bc2ea3
2 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/e2e_test/src/heal_erasure_disk_rebuild_test.rs
+53 -28
View File
@@ -594,6 +594,40 @@ mod tests {
error.as_service_error().and_then(ProvideErrorMetadata::code) == Some("ServiceUnavailable")
}
fn select_replacement_drive(
cluster: &RustFSTestClusterEnvironment,
node_index: usize,
require_pool_metadata: bool,
) -> Result<(PathBuf, PathBuf, Vec<u8>, Option<VersionShardCensus>), Box<dyn Error + Send + Sync>> {
let node = cluster
.nodes
.get(node_index)
.ok_or_else(|| format!("replacement node {node_index} is absent"))?;
let mut incomplete_pool_metadata = Vec::new();
for drive in &node.data_dirs {
let replaced_disk = PathBuf::from(drive);
let replacement_format_path = replaced_disk.join(".rustfs.sys").join("format.json");
let replacement_format = std::fs::read(&replacement_format_path).map_err(|err| {
format!("failed to capture target format before replacement wipe at {replacement_format_path:?}: {err}")
})?;
if !require_pool_metadata {
return Ok((replaced_disk, replacement_format_path, replacement_format, None));
}
let census = census_object_version_on_disk(&replaced_disk, RUSTFS_META_BUCKET, POOL_METADATA_OBJECT, None)?;
if census.is_complete() {
return Ok((replaced_disk, replacement_format_path, replacement_format, Some(census)));
}
incomplete_pool_metadata.push(census);
}
Err(format!(
"no replacement drive on node {node_index} held complete pool metadata before the fault: {incomplete_pool_metadata:?}"
)
.into())
}
async fn replacement_recovery_status(
cluster: &RustFSTestClusterEnvironment,
) -> Result<serde_json::Value, Box<dyn Error + Send + Sync>> {
@@ -1265,11 +1299,8 @@ mod tests {
let bucket = "heal-restart-during-rebuild";
clients[0].create_bucket().bucket(bucket).send().await?;
let replaced_disk = PathBuf::from(&cluster.nodes[1].data_dir);
let replacement_format_path = replaced_disk.join(".rustfs.sys").join("format.json");
let replacement_format = std::fs::read(&replacement_format_path).map_err(|err| {
format!("failed to capture target format before replacement wipe at {replacement_format_path:?}: {err}")
})?;
let (replaced_disk, replacement_format_path, replacement_format, expected_pool_metadata) =
select_replacement_drive(&cluster, 1, background_enabled)?;
let online_object_count = std::env::var("RUSTFS_HEAL_CHAOS_OBJECT_COUNT")
.ok()
.and_then(|value| value.parse::<usize>().ok())
@@ -1325,17 +1356,9 @@ mod tests {
attempt_count += 1;
}
let expected_pool_metadata = if background_enabled {
let census = census_object_version_on_disk(&replaced_disk, RUSTFS_META_BUCKET, POOL_METADATA_OBJECT, None)?;
assert!(
census.is_complete(),
"target must hold complete pool metadata before the fault: {census:?}"
);
if background_enabled {
wait_for_scanner_cycle_after(&cluster, 0).await?;
Some(census)
} else {
None
};
}
cluster.stop_node(1)?;
std::fs::remove_dir_all(&replaced_disk)?;
@@ -1351,18 +1374,12 @@ mod tests {
);
let outage_payload_seed = 0xf1;
let max_outage_write_attempts = if outage_target_manifest_required {
1
} else {
topology.total_drives().max(1)
};
let max_outage_write_attempts = topology.total_drives().max(1);
let mut outage_key = None;
let mut service_unavailable_outage_writes = 0usize;
let mut last_service_unavailable = None;
for attempt in 0..max_outage_write_attempts {
let candidate_key = if max_outage_write_attempts == 1 {
"cluster/written-while-node-down.bin".to_string()
} else {
format!("cluster/written-while-node-down-{attempt:04}.bin")
};
let candidate_key = format!("cluster/written-while-node-down-{attempt:04}.bin");
let put_result = timeout(
Duration::from_secs(30),
clients[2]
@@ -1378,13 +1395,21 @@ mod tests {
outage_key = Some(candidate_key);
break;
}
Ok(Err(error)) if !outage_target_manifest_required && is_service_unavailable_put(&error) => {}
Ok(Err(error)) if is_service_unavailable_put(&error) => {
service_unavailable_outage_writes += 1;
last_service_unavailable = Some(format!("{error:?}"));
}
Ok(Err(error)) => return Err(error.into()),
Err(error) => return Err(error.into()),
}
}
let outage_key = outage_key
.ok_or_else(|| format!("no online pool accepted an outage object after {max_outage_write_attempts} candidates"))?;
let outage_key = outage_key.ok_or_else(|| {
format!(
"no online pool accepted an outage object after {max_outage_write_attempts} candidates; \
observed {service_unavailable_outage_writes} ServiceUnavailable responses; \
last ServiceUnavailable: {last_service_unavailable:?}"
)
})?;
let mut outage_peer_erasure_indices = HashSet::new();
for (node_index, node) in cluster.nodes.iter().enumerate() {
scripts/run_scanner_heal_evidence_case.sh
+1
View File
@@ -281,6 +281,7 @@ export RUSTFS_E2E_EXPECTED_FEATURES="${RUSTFS_E2E_EXPECTED_FEATURES:-default}"
"$PYTHON_BIN" "$ROOT/scripts/check_test_wiring.py" --begin-scanner-heal "$RUN_DIR" "$ROOT/target/debug/rustfs" "$TEST_BINARY"
cp "$LISTING_TMP" "$RUN_DIR/listing.json"
export RUSTFS_E2E_LOG_DIR="${RUSTFS_E2E_LOG_DIR:-$RUN_DIR/e2e-logs}"
export RUSTFS_HEAL_CHAOS_LOG_DIR="${RUSTFS_HEAL_CHAOS_LOG_DIR:-$RUSTFS_E2E_LOG_DIR}"
mkdir -p "$RUSTFS_E2E_LOG_DIR"
JUNIT_PATH="$ROOT/target/nextest/$PROFILE/junit.xml"