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

fix(ecstore): fence snapshot stream polls on lock loss (#6930)

Browse Source 
Co-authored-by: heihutu <heihutu@gmail.com>
This commit is contained in:
houseme
2026-08-31 10:26:24 +08:00
committed by GitHub
parent 769da6d81f
commit c876df53f5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/store/object.rs
+3 -4
View File
@@ -884,8 +884,7 @@ impl AsyncRead for SelectObjectSnapshotReader {
} }
let filled_before = buf.filled().len(); let filled_before = buf.filled().len();
let poll = Pin::new(&mut self.inner).poll_read(cx, buf); let poll = Pin::new(&mut self.inner).poll_read(cx, buf);
let reached_eof = matches!(&poll, Poll::Ready(Ok(()))) && buf.filled().len() == filled_before; if self.lease.check().is_err() {
if self.lease.is_lost() || (reached_eof && self.lease.check().is_err()) {
buf.set_filled(filled_before); buf.set_filled(filled_before);
return Poll::Ready(Err(std::io::Error::other(SnapshotConsistencyError::LockLost))); return Poll::Ready(Err(std::io::Error::other(SnapshotConsistencyError::LockLost)));
} }
@@ -4209,7 +4208,7 @@ mod tests {
} }
#[tokio::test(flavor = "current_thread")] #[tokio::test(flavor = "current_thread")]
async fn select_snapshot_reader_checks_guards_at_eof_before_monitor_runs() { async fn select_snapshot_reader_checks_guards_before_monitor_runs() {
let (guard, signal, client) = refresh_failure_test_guard("select-snapshot-eof-fence").await; let (guard, signal, client) = refresh_failure_test_guard("select-snapshot-eof-fence").await;
client.reject_refreshes(); client.reject_refreshes();
client client
@@ -4234,7 +4233,7 @@ mod tests {
.await .await
.expect_err("EOF fence must reject a lease lost before its monitor is scheduled"); .expect_err("EOF fence must reject a lease lost before its monitor is scheduled");
assert_eq!(output, b"old-generation"); assert!(output.is_empty(), "bytes from a known-lost snapshot must not escape");
assert_eq!(error.kind(), std::io::ErrorKind::Other); assert_eq!(error.kind(), std::io::ErrorKind::Other);
} }