summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-09-23 22:54:43 -0700
committerSamuel Just <sam.just@inktank.com>2013-09-23 22:55:00 -0700
commit857e20227190845ac1c2d2977f7ee97249b189cb (patch)
treee7e5d88f61558866853279b16b35a3bd0f9d6a4f
parentc4088d25e789a8de5687f8f128e4d03fde0a6c6d (diff)
downloadceph-857e20227190845ac1c2d2977f7ee97249b189cb.tar.gz
[SQUASH]ReplicatedPG: finish_recovery_op in cancel_push
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index df9711e74c7..c831af45a84 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7422,6 +7422,7 @@ void ReplicatedPG::cancel_pull(const hobject_t &soid)
{
assert(recovering.count(soid));
recovering.erase(soid);
+ finish_recovery_op(soid);
pg_log.set_last_requested(0); // get recover_primary to start over
}