RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: rename op_waiters -> waiting_for_map

Browse Source 
That's what it is used for; make the name descriptive.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Sage Weil 2012-08-15 17:18:57 -07:00
parent 5962a9dde0
commit 10454721dc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/PG.cc
View File

@ -1518,7 +1518,7 @@ void PG::do_request(OpRequestRef op)
// do any pending flush
do_pending_flush();
if (must_delay_request(op)) {
op_waiters.push_back(op);
waiting_for_map.push_back(op);
return;
} else if (can_discard_request(op)) {
return;
@ -4115,7 +4115,7 @@ void PG::queue_op(OpRequestRef op)
void PG::take_waiters()
{
dout(10) << "take_waiters" << dendl;
requeue_ops(op_waiters);
requeue_ops(waiting_for_map);
for (list<CephPeeringEvtRef>::iterator i = peering_waiters.begin();
i != peering_waiters.end();
++i) osd->queue_for_peering(this);

2
src/osd/PG.h
View File

@ -395,7 +395,6 @@ public:
}
list<OpRequestRef> op_waiters;
list<OpRequestRef> op_queue; // op queue
bool dirty_info, dirty_log;
@ -625,6 +624,7 @@ protected:
// pg waiters
bool flushed;
list<OpRequestRef> waiting_for_map;
list<OpRequestRef> waiting_for_active;
list<OpRequestRef> waiting_for_all_missing;
map<hobject_t, list<OpRequestRef> > waiting_for_missing_object,

2
src/osd/ReplicatedPG.cc
View File

@ -5737,7 +5737,7 @@ void ReplicatedPG::apply_and_flush_repops(bool requeue)
}
if (requeue) {
op_waiters.splice(op_waiters.end(), rq);
waiting_for_map.splice(waiting_for_map.end(), rq);
}
}