gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-27 15:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): unblock config and e2e checks

Browse Source 
Co-Authored-By: heihutu <heihutu@gmail.com>
This commit is contained in:
houseme
2026-07-31 22:50:30 +08:00
parent 868bd873b7
commit c3908711ec
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/config/com.rs
+5 -6
View File
@@ -4740,14 +4740,13 @@ mod tests {
) -> Result<ObjectInfo> { ) -> Result<ObjectInfo> {
let current_etag = format!("config-{}", self.revision.load(Ordering::SeqCst)); let current_etag = format!("config-{}", self.revision.load(Ordering::SeqCst));
let object_exists = matches!(&*self.state.lock().expect("state lock poisoned"), RecoveryReadState::Blob(_)); let object_exists = matches!(&*self.state.lock().expect("state lock poisoned"), RecoveryReadState::Blob(_));
if let Some(preconditions) = &opts.http_preconditions { if let Some(preconditions) = &opts.http_preconditions
if preconditions && (preconditions
.if_match_value() .if_match_value()
.is_some_and(|etag| !object_exists || etag != current_etag) .is_some_and(|etag| !object_exists || etag != current_etag)
|| (object_exists && preconditions.if_none_match_value() == Some("*")) || (object_exists && preconditions.if_none_match_value() == Some("*")))
{ {
return Err(Error::PreconditionFailed); return Err(Error::PreconditionFailed);
}
} }
let mut body = Vec::new(); let mut body = Vec::new();
data.stream.read_to_end(&mut body).await?; data.stream.read_to_end(&mut body).await?;
scripts/e2e-run.sh
+13 -1
View File
@@ -40,7 +40,19 @@ export RUST_BACKTRACE=full
"$BIN" --address "127.0.0.1:${RUSTFS_TEST_PORT}" "$VOLUME" > "${RUSTFS_TEST_LOG}" 2>&1 & "$BIN" --address "127.0.0.1:${RUSTFS_TEST_PORT}" "$VOLUME" > "${RUSTFS_TEST_LOG}" 2>&1 &
RUSTFS_PID=$! RUSTFS_PID=$!
sleep 10 for _ in {1..60}; do
if curl --noproxy '*' --silent --fail "http://127.0.0.1:${RUSTFS_TEST_PORT}/health/ready" >/dev/null; then
break
fi
if ! kill -0 "${RUSTFS_PID}" 2>/dev/null; then
wait "${RUSTFS_PID}"
fi
sleep 1
done
curl --noproxy '*' --silent --show-error --fail "http://127.0.0.1:${RUSTFS_TEST_PORT}/health/ready" >/dev/null
export AWS_ACCESS_KEY_ID="${RUSTFS_ACCESS_KEY:-rustfsadmin}" export AWS_ACCESS_KEY_ID="${RUSTFS_ACCESS_KEY:-rustfsadmin}"
export AWS_SECRET_ACCESS_KEY="${RUSTFS_SECRET_KEY:-rustfsadmin}" export AWS_SECRET_ACCESS_KEY="${RUSTFS_SECRET_KEY:-rustfsadmin}"