External/bichon
1
0
Fork 0
mirror of https://github.com/rustmailer/bichon.git synced 2026-08-03 07:48:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257 from mmaudet/fix/gc-blob-still-referenced

Browse Source 
fix: prevent the dedup GC from deleting a still-referenced content blob
This commit is contained in:
rustmailer
2026-05-23 10:58:34 +08:00
committed by GitHub
parent 26c14fcaaf 895ea543a9
commit 21a7f7e9d5
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/core/src/store/tantivy/envelope.rs
+24 -3
View File
@@ -733,7 +733,11 @@ impl IndexManager {
.await?; .await?;
if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() { if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?; self.cleanup_unused_content(
&mut writer,
eml_content_hashes,
attachments_content_hashes,
)?;
} }
Ok(()) Ok(())
} }
@@ -772,7 +776,11 @@ impl IndexManager {
.map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?; .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() { if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?; self.cleanup_unused_content(
&mut writer,
eml_content_hashes,
attachments_content_hashes,
)?;
} }
Ok(()) Ok(())
} }
@@ -817,9 +825,18 @@ impl IndexManager {
fn cleanup_unused_content( fn cleanup_unused_content(
&self, &self,
writer: &mut IndexWriter,
eml_content_hashes: HashSet<String>, eml_content_hashes: HashSet<String>,
attachments_content_hashes: HashSet<String>, attachments_content_hashes: HashSet<String>,
) -> BichonResult<()> { ) -> BichonResult<()> {
// Reference-count barrier: commit the writer and reload the reader so the
// `Count` below is evaluated against a fully committed, freshly-reloaded
// index state. Without this, an envelope that shares a content hash but
// is still sitting uncommitted in the writer buffer (e.g. added by the
// background ingest task before this delete acquired the writer lock)
// would be invisible to the searcher, the count would read 0, and a
// still-referenced blob would be deleted.
fatal_commit(writer);
let searcher = self.create_searcher()?; let searcher = self.create_searcher()?;
let fields = SchemaTools::email_fields(); let fields = SchemaTools::email_fields();
let mut eml: HashSet<String> = HashSet::new(); let mut eml: HashSet<String> = HashSet::new();
@@ -900,7 +917,11 @@ impl IndexManager {
.map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?; .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() { if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?; self.cleanup_unused_content(
&mut writer,
eml_content_hashes,
attachments_content_hashes,
)?;
} }
Ok(()) Ok(())