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

Use iterate_with_stable in list_objects too

Browse Source 
Fixes "different fact_versions returned from subops" with EC in some cases
This commit is contained in:
Vitaliy Filippov
2026-03-02 01:48:33 +03:00
parent 3fbe2e7f8a
commit 42fc45d6da
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_heap.cpp
+9 -12
View File
@@ -1978,24 +1978,21 @@ int blockstore_heap_t::list_objects(uint32_t pg_num, object_id min_oid, object_i
return; return;
} }
uint64_t stable_version = 0; uint64_t stable_version = 0;
auto first_wr = obj; iterate_with_stable(obj, UINT64_MAX, [&](heap_entry_t* wr, bool stable)
for (auto wr = first_wr; wr; wr = prev(wr))
{ {
if ((wr->entry_type & BS_HEAP_STABLE) || wr->type() == BS_HEAP_COMMIT || wr->type() == BS_HEAP_ROLLBACK) if (stable)
{ {
stable_version = wr->version; stable_version = wr->version;
break; return false;
} }
else if (unstable_size >= unstable_alloc)
{ {
if (unstable_size >= unstable_alloc) unstable_alloc = (!unstable_alloc ? 128 : unstable_alloc*2);
{ unstable = (obj_ver_id*)realloc_or_die(unstable, sizeof(obj_ver_id) * unstable_alloc);
unstable_alloc = (!unstable_alloc ? 128 : unstable_alloc*2);
unstable = (obj_ver_id*)realloc_or_die(unstable, sizeof(obj_ver_id) * unstable_alloc);
}
unstable[unstable_size++] = (obj_ver_id){ .oid = oid, .version = wr->version };
} }
} unstable[unstable_size++] = (obj_ver_id){ .oid = oid, .version = wr->version };
return true;
});
if (stable_version) if (stable_version)
{ {
if (res_size >= res_alloc) if (res_size >= res_alloc)