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

Allow to cancel compaction for unfinished writes

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-11-23 19:08:23 +03:00
parent df1ab722dd
commit 999d0e2961
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_heap.cpp
+8 -4
View File
@@ -1249,7 +1249,7 @@ void blockstore_heap_t::mark_overwritten(uint64_t over_lsn, uint64_t inode, heap
{
if (wr->needs_compact(0))
{
mark_lsn_compacted(wr->lsn);
mark_lsn_compacted(wr->lsn, true);
}
if ((wr->flags & BS_HEAP_TYPE) == BS_HEAP_BIG_WRITE)
{
@@ -1676,8 +1676,12 @@ void blockstore_heap_t::erase_object(uint32_t block_num, heap_object_t *obj, uin
if (!lsn)
{
for (auto wr = obj->get_writes(); wr; wr = wr->next())
{
if (wr->needs_compact(0))
mark_lsn_compacted(wr->lsn);
{
mark_lsn_compacted(wr->lsn, true);
}
}
free_object_space(obj->inode, obj->get_writes(), NULL);
}
else
@@ -1979,11 +1983,11 @@ void blockstore_heap_t::mark_lsn_fsynced(uint64_t lsn)
}
}
void blockstore_heap_t::mark_lsn_compacted(uint64_t lsn)
void blockstore_heap_t::mark_lsn_compacted(uint64_t lsn, bool allow_undone)
{
assert(lsn >= first_inflight_lsn && lsn < first_inflight_lsn+inflight_lsn.size());
auto & item = inflight_lsn[lsn - first_inflight_lsn];
assert(item.flags & HEAP_INFLIGHT_DONE);
assert((item.flags & HEAP_INFLIGHT_DONE) || allow_undone);
if (!(item.flags & HEAP_INFLIGHT_COMPACTABLE))
return;
item.flags -= HEAP_INFLIGHT_COMPACTABLE;
src/blockstore/blockstore_heap.h
+1 -1
View File
@@ -253,7 +253,7 @@ public:
// inflight write tracking
void mark_lsn_completed(uint64_t lsn);
void mark_lsn_fsynced(uint64_t lsn);
void mark_lsn_compacted(uint64_t lsn);
void mark_lsn_compacted(uint64_t lsn, bool allow_undone = false);
void mark_object_compacted(heap_object_t *obj, uint64_t max_lsn);
void mark_lsn_trimmed(uint64_t lsn);
uint64_t get_completed_lsn();