vitastor-disk: Fix stable/rollback handling in index_journal_by_object #127

Merged
vitalif merged 1 commits from koolkhel/vitastor:disk-meta-journal-keys into master 2026-11-17 23:36:22 +03:00

View File

@@ -917,10 +917,10 @@ int disk_tool_t::index_journal_by_object(json11::Json journal,
}
else if (rec["type"] == "stable")
{
uint64_t commit_to = rec["version"].uint64_value();
uint64_t commit_to = rec["ver"].uint64_value();
for (size_t i = 0; i < jbo.size(); i++)
{
if (jbo[i]["version"].uint64_value() <= commit_to)
if (jbo[i]["ver"].uint64_value() <= commit_to)
{
if (jbo[i]["type"] == "big_write")
{
@@ -937,10 +937,10 @@ int disk_tool_t::index_journal_by_object(json11::Json journal,
}
else if (rec["type"] == "rollback")
{
uint64_t rollback_to = rec["version"].uint64_value();
for (size_t i = jbo.size()-1; i >= 0; i--)
uint64_t rollback_to = rec["ver"].uint64_value();
for (int i = jbo.size()-1; i >= 0; i--)
{
if (jbo[i]["version"].uint64_value() > rollback_to)
if (jbo[i]["ver"].uint64_value() > rollback_to)
jbo.erase(jbo.begin()+i, jbo.begin()+i+1);
}
}