vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 68 Wiki Activity

Return real version on CAS failure

nbd-vmsplice
Vitaliy Filippov 2021-08-01 20:05:19 +03:00
parent acf637950c
commit 5cf1157f16
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osd_primary.cpp
View File

@ -353,6 +353,7 @@ resume_3:
if (cur_op->req.rw.version && op_data->fact_ver != (cur_op->req.rw.version-1))
{
cur_op->reply.hdr.retval = -EINTR;
cur_op->reply.rw.version = op_data->fact_ver;
goto continue_others;
}
// Save version override for parallel reads

2
src/osd_primary_write.cpp
View File

@ -100,6 +100,7 @@ resume_3:
if (cur_op->req.rw.version && op_data->fact_ver != (cur_op->req.rw.version-1))
{
cur_op->reply.hdr.retval = -EINTR;
cur_op->reply.rw.version = op_data->fact_ver;
goto continue_others;
}
if (op_data->scheme == POOL_SCHEME_REPLICATED)
@ -260,6 +261,7 @@ resume_9:
}
}
cur_op->reply.hdr.retval = cur_op->req.rw.len;
cur_op->reply.rw.version = op_data->fact_ver;
continue_others:
osd_op_t *next_op = NULL;
auto next_it = pg.write_queue.find(op_data->oid);