Skip to content

Commit

Permalink
osd/ReplicatedPG: don't check order in finish_proxy_read
Browse files Browse the repository at this point in the history
Read doesn't need to be ordered. So when proxy read comes back from base
tier, it's not necessarily at the front of the in progress list.

Fixes: #11211

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
(cherry picked from commit 560a583)
  • Loading branch information
wonzhq authored and liewegas committed Apr 24, 2015
1 parent 8a58d83 commit 0ee022b
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/osd/ReplicatedPG.cc
Expand Up @@ -2060,9 +2060,12 @@ void ReplicatedPG::finish_proxy_read(hobject_t oid, ceph_tid_t tid, int r)
return;
}
assert(q->second.size());
OpRequestRef op = q->second.front();
assert(op == prdop->op);
q->second.pop_front();
list<OpRequestRef>::iterator it = std::find(q->second.begin(),
q->second.end(),
prdop->op);
assert(it != q->second.end());
OpRequestRef op = *it;
q->second.erase(it);
if (q->second.size() == 0) {
in_progress_proxy_reads.erase(oid);
}
Expand Down

0 comments on commit 0ee022b

Please sign in to comment.