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

Fix loading for out-of-order lsns

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-12-02 01:52:12 +03:00
parent 064a94166c
commit a98aee7906
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_heap.cpp
+19 -10
View File
@@ -356,23 +356,32 @@ skip_object:
offsets_seen.insert({ .start = wr_pos, .end = wr_pos+wr->size, .type = 2 }); offsets_seen.insert({ .start = wr_pos, .end = wr_pos+wr->size, .type = 2 });
} }
// Check for duplicates // Check for duplicates
uint64_t lsn = obj->get_writes()->lsn;
auto oid = (object_id){ .inode = obj->inode, .stripe = obj->stripe }; auto oid = (object_id){ .inode = obj->inode, .stripe = obj->stripe };
uint32_t dup_block; uint32_t dup_block;
heap_object_t *dup_obj = read_entry(oid, &dup_block); heap_object_t *dup_obj = read_entry(oid, &dup_block);
if (dup_obj != NULL) if (dup_obj != NULL)
{ {
if (dup_obj->get_writes()->lsn >= lsn) uint64_t lsn = 0;
for (auto wr = obj->get_writes(); wr; wr = wr->next())
{
lsn = lsn < wr->lsn ? wr->lsn : lsn;
}
uint64_t dup_lsn = 0;
for (auto wr = dup_obj->get_writes(); wr; wr = wr->next())
{
dup_lsn = dup_lsn < wr->lsn ? wr->lsn : dup_lsn;
}
if (dup_lsn >= lsn)
{ {
// Object is duplicated on disk // Object is duplicated on disk
fprintf(stderr, "Warning: Object %jx:%jx in metadata block %u at %u is an older duplicate, skipping\n", fprintf(stderr, "Warning: Object %jx:%jx in metadata block %u at %u is an older duplicate (lsn %lu <= %lu), skipping\n",
obj->inode, obj->stripe, block_num, block_offset); obj->inode, obj->stripe, block_num, block_offset, dup_lsn, lsn);
goto skip_object; goto skip_object;
} }
else else
{ {
fprintf(stderr, "Warning: Object %jx:%jx in metadata block %u at %u is a newer duplicate, overriding\n", fprintf(stderr, "Warning: Object %jx:%jx in metadata block %u at %u is a newer duplicate (lsn %lu < %lu), overriding\n",
obj->inode, obj->stripe, block_num, block_offset); obj->inode, obj->stripe, block_num, block_offset, dup_lsn, lsn);
erase_object(dup_block, dup_obj, 0, false); erase_object(dup_block, dup_obj, 0, false);
} }
} }
@@ -473,10 +482,10 @@ skip_object:
{ {
tmp_compact_queue.push_back((tmp_compact_item_t){ .oid = oid, .lsn = wr->lsn, .compact = wr->needs_compact(this) }); tmp_compact_queue.push_back((tmp_compact_item_t){ .oid = oid, .lsn = wr->lsn, .compact = wr->needs_compact(this) });
} }
} if (wr->lsn > next_lsn)
if (lsn > next_lsn) {
{ next_lsn = wr->lsn;
next_lsn = lsn; }
} }
if (to_recheck) if (to_recheck)
{ {