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

Fix iterate_compaction for the case of unfinished commit/rollback

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-12-02 01:52:12 +03:00
parent 4e0b203552
commit e9f0639e62
4 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_heap.cpp
+4 -4
View File
@@ -1624,9 +1624,9 @@ heap_compact_t blockstore_heap_t::iterate_compaction(heap_entry_t *obj, uint64_t
res.do_delete = true;
for (heap_entry_t *wr = obj; wr; wr = prev(wr))
{
if (wr->type() == BS_HEAP_ROLLBACK)
if (wr->type() == BS_HEAP_ROLLBACK && wr->lsn <= fsynced_lsn)
{
if (wr->lsn <= fsynced_lsn && !res.compact_lsn)
if (!res.compact_lsn)
{
res.compact_lsn = wr->lsn;
res.compact_version = wr->version;
@@ -1634,9 +1634,9 @@ heap_compact_t blockstore_heap_t::iterate_compaction(heap_entry_t *obj, uint64_t
rollback_version = wr->version;
continue;
}
if (wr->type() == BS_HEAP_COMMIT)
if (wr->type() == BS_HEAP_COMMIT && wr->lsn <= fsynced_lsn)
{
if (wr->lsn <= fsynced_lsn && !res.compact_lsn)
if (!res.compact_lsn)
{
res.compact_lsn = wr->lsn;
res.compact_version = wr->version;
src/blockstore/blockstore_read.cpp
+4
View File
@@ -22,6 +22,10 @@ int blockstore_impl_t::dequeue_read(blockstore_op_t *op)
bool found = false;
heap->iterate_with_stable(obj, obj->lsn, [&](heap_entry_t *wr, bool stable)
{
if (wr->type() == BS_HEAP_DELETE)
{
return false;
}
if (op->version < wr->version)
{
return true;