From 808fa9ad399eda209ca971688950ab5be881b00b Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 4 Oct 2013 15:54:21 -0700 Subject: [PATCH] ReplicatedPG: cache: don't handle cache if the obc is blocked Right now the only way that can happen is if we're in the middle of a promote! Signed-off-by: Greg Farnum --- src/osd/ReplicatedPG.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 1952b860372c5..df69ecb20e47b 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1147,6 +1147,10 @@ void ReplicatedPG::do_op(OpRequestRef op) bool ReplicatedPG::maybe_handle_cache(OpRequestRef op, ObjectContextRef obc, int r) { + if (obc.get() && obc->is_blocked()) { + // we're already doing something with this object + return false; + } switch(pool.info.cache_mode) { case pg_pool_t::CACHEMODE_NONE: return false; -- 2.39.5