]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: avoid using null agent_state 25393/head
authorZengran Zhang <zhangzengran@sangfor.com.cn>
Tue, 4 Dec 2018 13:19:18 +0000 (21:19 +0800)
committerZengran Zhang <zhangzengran@sangfor.com.cn>
Tue, 4 Dec 2018 13:19:18 +0000 (21:19 +0800)
the agent_state has no lock guard,so need to check if it is null

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
src/osd/PrimaryLogPG.cc

index 77210e2c861487e29982186d2f352e173c35460d..ff34105ab1ca80e935458d44a4f47fa48c82ae69 100644 (file)
@@ -10146,7 +10146,8 @@ int PrimaryLogPG::try_flush_mark_clean(FlushOpRef fop)
   }
 
   // successfully flushed, can we evict this object?
-  if (!obc->obs.oi.has_manifest() && !fop->op && agent_state->evict_mode != TierAgentState::EVICT_MODE_IDLE &&
+  if (!obc->obs.oi.has_manifest() && !fop->op &&
+      agent_state && agent_state->evict_mode != TierAgentState::EVICT_MODE_IDLE &&
       agent_maybe_evict(obc, true)) {
     osd->logger->inc(l_osd_tier_clean);
     if (fop->on_flush) {