mirror of
https://github.com/deepseek-ai/3FS
synced 2025-06-26 18:16:45 +00:00
bugfix: let meta_cache.remove happen after meta_store.write (#252)
Co-authored-by: keji.zyq <keji.zyq@alibaba-inc.com>
This commit is contained in:
parent
d0883bab13
commit
de5e47e8de
@ -656,22 +656,28 @@ impl Engine {
|
|||||||
end: impl AsRef<[u8]>,
|
end: impl AsRef<[u8]>,
|
||||||
max_count: u64,
|
max_count: u64,
|
||||||
) -> Result<u64> {
|
) -> Result<u64> {
|
||||||
let mut chunks = self.meta_store.query_chunks(begin, end, max_count)?;
|
let chunks = self.meta_store.query_chunks(begin, end, max_count)?;
|
||||||
|
let chunks_len = chunks.len();
|
||||||
const BATCH_SIZE: Size = Size::mebibyte(1);
|
const BATCH_SIZE: Size = Size::mebibyte(1);
|
||||||
let mut write_batch = RocksDB::new_write_batch();
|
let mut write_batch = RocksDB::new_write_batch();
|
||||||
for (chunk_id, meta) in &mut chunks {
|
let mut persist_end = 0;
|
||||||
if write_batch.size_in_bytes() >= BATCH_SIZE.0 as usize {
|
for (index, (chunk_id, meta)) in chunks.iter().enumerate() {
|
||||||
|
if write_batch.size_in_bytes() >= BATCH_SIZE.0 as _ {
|
||||||
self.meta_store.write(write_batch, true)?;
|
self.meta_store.write(write_batch, true)?;
|
||||||
|
for i in persist_end..index + 1 {
|
||||||
|
self.meta_cache.remove(&chunks[i].0);
|
||||||
|
}
|
||||||
|
persist_end = index + 1;
|
||||||
write_batch = RocksDB::new_write_batch();
|
write_batch = RocksDB::new_write_batch();
|
||||||
}
|
}
|
||||||
|
|
||||||
self.meta_store
|
self.meta_store
|
||||||
.remove_mut(chunk_id, meta, &mut write_batch)?;
|
.remove_mut(&chunk_id, &meta, &mut write_batch)?;
|
||||||
self.meta_cache.remove(chunk_id);
|
|
||||||
}
|
}
|
||||||
if !write_batch.is_empty() {
|
if !write_batch.is_empty() {
|
||||||
self.meta_store.write(write_batch, true)?;
|
self.meta_store.write(write_batch, true)?;
|
||||||
|
for i in persist_end..chunks_len {
|
||||||
|
self.meta_cache.remove(&chunks[i].0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Ok(chunks.len() as _)
|
Ok(chunks.len() as _)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user