From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Feb 2014 21:05:58 +0000 (-0800)
Subject: osd/ReplicatedPG: make agent skip blocked obcs
X-Git-Tag: v0.78~166^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63f5a799aac8607e460e7ca0cf86066cb0ac5f12;p=ceph.git

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 68c5e2e985d..51f6168930d 100644
--- 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() &&