osd/ReplicatedPG: make agent skip blocked obcs

Among other things, this can interfere with an in-flight copy-from and
corrupt the pg stats.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 68c5e2e985d711bdff8789954bd29faaa56c1ef6..51f6168930dab5a351ccd708bcd1e31d39bedc94 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10295,6 +10295,10 @@ void ReplicatedPG::agent_work(int start_max)
       dout(20) << __func__ << " skip (hit set) " << obc->obs.oi << dendl;
       continue;
     }
+    if (obc->is_blocked()) {
+      dout(20) << __func__ << " skip (blocked) " << obc->obs.oi << dendl;
+      continue;
+    }
 
     // be careful flushing omap to an EC pool.
     if (base_pool->is_erasure() &&