mirror of
https://github.com/ceph/ceph
synced 2025-02-23 02:57:21 +00:00
osd: clean out redundant (and wrong) complete calculation
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
1bb60b45a8
commit
f6b47e386d
@ -3510,7 +3510,7 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op)
|
|||||||
dout(10) << "sub_op_push need " << data_needed << ", got " << data_subset
|
dout(10) << "sub_op_push need " << data_needed << ", got " << data_subset
|
||||||
<< ", overlap " << overlap << dendl;
|
<< ", overlap " << overlap << dendl;
|
||||||
|
|
||||||
if (op->complete) {
|
if (complete) {
|
||||||
// FIXME: we should verify that we got the whole thing.
|
// FIXME: we should verify that we got the whole thing.
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3547,13 +3547,6 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op)
|
|||||||
// head|unversioned. for now, primary will _only_ pull full copies of the head.
|
// head|unversioned. for now, primary will _only_ pull full copies of the head.
|
||||||
assert(op->clone_subsets.empty());
|
assert(op->clone_subsets.empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pi->data_subset.empty()) {
|
|
||||||
complete = true;
|
|
||||||
} else {
|
|
||||||
complete = pi->data_subset.end() == data_subset.end();
|
|
||||||
}
|
|
||||||
assert(complete == op->complete);
|
|
||||||
}
|
}
|
||||||
dout(15) << " data_subset " << data_subset
|
dout(15) << " data_subset " << data_subset
|
||||||
<< " clone_subsets " << clone_subsets
|
<< " clone_subsets " << clone_subsets
|
||||||
|
Loading…
Reference in New Issue
Block a user