]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::cancel_pull: also finish_degraded_object 5599/head
authorSamuel Just <sjust@redhat.com>
Mon, 17 Aug 2015 18:21:49 +0000 (11:21 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 18 Aug 2015 18:25:25 +0000 (11:25 -0700)
We might have degraded object waiters on a pull.

Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc

index 98078f85d1f05e8e3939b82c428987e4a1db58e2..738e42074b1eb9fbe25f953829788f3eef78eaff 100644 (file)
@@ -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)