]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: don't move on to the next snap immediately
authorSamuel Just <sam.just@inktank.com>
Tue, 23 Sep 2014 22:52:08 +0000 (15:52 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 2 Dec 2014 21:48:42 +0000 (13:48 -0800)
If we have a bunch of trimmed snaps for which we have no
objects, we'll spin for a long time.  Instead, requeue.

Fixes: #9487
Backport: dumpling, firefly, giant
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit c17ac03a50da523f250eb6394c89cc7e93cb4659)

src/osd/ReplicatedPG.cc

index 4d460bcaa3da998cecc547b2d33ab15a9c874af6..e149abfd2c75687ee5b51d9bc3f982131fb9865d 100644 (file)
@@ -12154,7 +12154,7 @@ boost::statechart::result ReplicatedPG::WaitingOnReplicas::react(const SnapTrim&
   context<SnapTrimmer>().need_share_pg_info = true;
 
   // Back to the start
-  post_event(SnapTrim());
+  pg->queue_snap_trim();
   return transit< NotTrimming >();
 }