From 0e3af8d8f9b980ed03d5644c42bfe05100220016 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 1 Dec 2014 14:52:11 -0800 Subject: [PATCH] ReplicatedPG: only populate_obc_watchers if active Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index afb53d60cf6..f63d1de93d8 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -7902,7 +7902,8 @@ ObjectContextRef ReplicatedPG::create_object_context(const object_info_t& oi, if (ssc) register_snapset_context(ssc); dout(10) << "create_object_context " << (void*)obc.get() << " " << oi.soid << " " << dendl; - populate_obc_watchers(obc); + if (is_active()) + populate_obc_watchers(obc); return obc; } @@ -7970,7 +7971,8 @@ ObjectContextRef ReplicatedPG::get_object_context(const hobject_t& soid, soid, true, soid.has_snapset() ? attrs : 0); - populate_obc_watchers(obc); + if (is_active()) + populate_obc_watchers(obc); if (pool.info.require_rollback()) { if (attrs) { -- 2.47.3