thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abort compaction if overwritten

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-12-02 01:52:12 +03:00
parent 60fcb168fe
commit e55927076c
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_flush.cpp
+8 -1
View File
@@ -409,8 +409,15 @@ resume_11:
flusher->flushing.erase(cur_oid); flusher->flushing.erase(cur_oid);
goto resume_0; goto resume_0;
} }
bs->heap->add_compact(cur_obj, compact_info.compact_version, compact_info.compact_lsn, clean_loc, res = bs->heap->add_compact(cur_obj, compact_info.compact_version, compact_info.compact_lsn, clean_loc,
compact_info.do_delete, &modified_block, new_bmp, new_ext_bmp, new_csums); compact_info.do_delete, &modified_block, new_bmp, new_ext_bmp, new_csums);
if (res == EBUSY)
{
// Abort compaction, object is already overwritten by something else
flusher->flushing.erase(cur_oid);
goto resume_0;
}
assert(res == 0);
resume_12: resume_12:
resume_13: resume_13:
if (!write_meta_block(12)) if (!write_meta_block(12))
src/blockstore/blockstore_heap.cpp
+5
View File
@@ -1345,6 +1345,11 @@ int blockstore_heap_t::add_big_intent(object_id oid, heap_entry_t **obj_ptr, uin
int blockstore_heap_t::add_compact(heap_entry_t *obj, uint64_t compact_version, uint64_t compact_lsn, uint64_t compact_location, int blockstore_heap_t::add_compact(heap_entry_t *obj, uint64_t compact_version, uint64_t compact_lsn, uint64_t compact_location,
bool do_delete, uint32_t *modified_block, uint8_t *new_int_bitmap, uint8_t *new_ext_bitmap, uint8_t *new_csums) bool do_delete, uint32_t *modified_block, uint8_t *new_int_bitmap, uint8_t *new_ext_bitmap, uint8_t *new_csums)
{ {
for (auto wr = obj; wr && wr->lsn > compact_lsn; wr = prev(wr))
{
if (wr->is_overwrite())
return EBUSY;
}
if (do_delete) if (do_delete)
{ {
return add_entry(get_simple_entry_size(), modified_block, false, false, [&](heap_entry_t *wr) return add_entry(get_simple_entry_size(), modified_block, false, false, [&](heap_entry_t *wr)