RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-07 00:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: fix the setting of soid in sub_op_push

Browse Source 
In the case of recovery pull using sub op, and if the prep push on
remote peers fail for some reasons, recovery_info.soid is not set
in prep_push_op_blank. Use it on the primary would lead to an
assertion failure.

Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
This commit is contained in:
Zhiqiang Wang 2016-09-12 00:29:54 -04:00
parent d25b3550da
commit 1842a910cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osd/ReplicatedBackend.cc
View File

@ -2353,7 +2353,7 @@ void ReplicatedBackend::sub_op_push(OpRequestRef op)
MOSDSubOp *m = static_cast<MOSDSubOp *>(op->get_req());
PushOp pop;
pop.soid = m->recovery_info.soid;
pop.soid = m->poid;
pop.version = m->version;
m->claim_data(pop.data);
pop.data_included.swap(m->data_included);