ReplicatedPG::snap_trimmer: requeue if scrub_block_writes

Otherwise, we do not continue snap_trimming once scrub is
complete.

Noticed while revewing another patch.  This would result
in snaps not being trimmed again until the next map
update.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 79efb7cff81c5961898f40c6a122c8ae8d3b875a..684d361146b1d3097d24d7fc87502b09f8bf0b41 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1439,16 +1439,15 @@ void ReplicatedPG::snap_trimmer()
   dout(10) << "snap_trimmer entry" << dendl;
   if (is_primary()) {
     entity_inst_t nobody;
-    if (!mode.try_write(nobody)) {
+    if (!mode.try_write(nobody) || scrub_block_writes) {
       dout(10) << " can't write, requeueing" << dendl;
       queue_snap_trim();
       unlock();
       return;
     }
-    if (!scrub_block_writes) {
-      dout(10) << "snap_trimmer posting" << dendl;
-      snap_trimmer_machine.process_event(SnapTrim());
-    }
+
+    dout(10) << "snap_trimmer posting" << dendl;
+    snap_trimmer_machine.process_event(SnapTrim());
 
     if (snap_trimmer_machine.need_share_pg_info) {
       dout(10) << "snap_trimmer share_pg_info" << dendl;