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

PG: remove sub_op_scrub

Browse Source 
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
This commit is contained in:
Samuel Just 2011-02-04 17:23:15 -08:00 committed by Sage Weil
parent 212f977f11
commit 416292027d
3 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/osd/PG.cc
View File

@ -2807,41 +2807,6 @@ bool PG::sched_scrub()
return ret;
}
void PG::sub_op_scrub(MOSDSubOp *op)
{
dout(7) << "sub_op_scrub" << dendl;
if (op->map_epoch < info.history.same_acting_since) {
dout(10) << "sub_op_scrub discarding old sub_op from "
<< op->map_epoch << " < " << info.history.same_acting_since << dendl;
op->put();
return;
}
ScrubMap map;
if (op->version > eversion_t()) {
epoch_t epoch = info.history.same_acting_since;
finalizing_scrub = 1;
while (last_update_applied != info.last_update) {
wait();
if (epoch != info.history.same_acting_since ||
osd->is_stopping()) {
dout(10) << "scrub pg changed, aborting" << dendl;
return;
}
}
build_inc_scrub_map(map, op->version);
finalizing_scrub = 0;
} else {
build_scrub_map(map);
}
MOSDSubOpReply *reply = new MOSDSubOpReply(op, 0, osd->osdmap->get_epoch(), CEPH_OSD_FLAG_ACK);
::encode(map, reply->get_data());
osd->cluster_messenger->send_message(reply, op->get_connection());
op->put();
}
void PG::sub_op_scrub_map(MOSDSubOp *op)
{

1
src/osd/PG.h
View File

@ -911,7 +911,6 @@ public:
bool sched_scrub();
void replica_scrub(class MOSDRepScrub *op);
void sub_op_scrub(class MOSDSubOp *op);
void sub_op_scrub_map(class MOSDSubOp *op);
void sub_op_scrub_reserve(class MOSDSubOp *op);
void sub_op_scrub_reserve_reply(class MOSDSubOpReply *op);

3
src/osd/ReplicatedPG.cc
View File

@ -481,9 +481,6 @@ void ReplicatedPG::do_sub_op(MOSDSubOp *op)
case CEPH_OSD_OP_PUSH:
sub_op_push(op);
return;
case CEPH_OSD_OP_SCRUB:
sub_op_scrub(op);
return;
case CEPH_OSD_OP_SCRUB_RESERVE:
sub_op_scrub_reserve(op);
return;