From: Samuel Just <sjust@redhat.com>
Date: Mon, 17 Aug 2015 18:21:49 +0000 (-0700)
Subject: ReplicatedPG::cancel_pull: also finish_degraded_object
X-Git-Tag: v9.1.0~345^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5599%2Fhead;p=ceph.git

ReplicatedPG::cancel_pull: also finish_degraded_object

We might have degraded object waiters on a pull.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 98078f85d1f..738e42074b1 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9357,6 +9357,7 @@ void ReplicatedPG::cancel_pull(const hobject_t &soid)
   }
   if (is_missing_object(soid))
     pg_log.set_last_requested(0); // get recover_primary to start over
+  finish_degraded_object(soid);
 }
 
 void ReplicatedPG::check_recovery_sources(const OSDMapRef osdmap)