Fix BS_OP_ROLLBACK removing an incorrect version
Instead of only removing versions with oid == X and version > Y it was also removing the previous version in list (with the previous oid or with version == Y)trace-sqes
parent
7df384031a
commit
d1602b50b3
|
@ -171,15 +171,15 @@ resume_5:
|
|||
rm_start--;
|
||||
while (1)
|
||||
{
|
||||
if (rm_start->first.oid != v->oid)
|
||||
break;
|
||||
else if (rm_start->first.version <= v->version)
|
||||
if (rm_start->first.oid != v->oid || rm_start->first.version <= v->version)
|
||||
{
|
||||
rm_start++;
|
||||
break;
|
||||
}
|
||||
if (rm_start == dirty_db.begin())
|
||||
break;
|
||||
rm_start--;
|
||||
}
|
||||
if (rm_end != rm_start)
|
||||
erase_dirty(rm_start, rm_end, UINT64_MAX);
|
||||
}
|
||||
journal.trim();
|
||||
|
|
|
@ -247,7 +247,6 @@ void osd_t::handle_primary_subop(uint64_t opcode, osd_op_t *cur_op, int retval,
|
|||
{
|
||||
if (op_data->fact_ver != 0 && op_data->fact_ver != version)
|
||||
{
|
||||
// FIXME There is still a bug that leads to this exception sometimes :-((
|
||||
throw std::runtime_error(
|
||||
"different fact_versions returned from "+std::string(osd_op_names[opcode])+
|
||||
" subops: "+std::to_string(version)+" vs "+std::to_string(op_data->fact_ver)
|
||||
|
|
Loading…
Reference in New Issue