From d8ca88dd4b47b4956211d206b0d42112e5842d3f Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 22 Sep 2015 11:44:18 -0700 Subject: [PATCH] OSDService::agent_entry: don't use PG::operator<< without pg lock Fixes: #13199 Signed-off-by: Samuel Just (cherry picked from commit d422f2820d5beee15117e166546a6386120e0349) Conflicts: src/osd/OSD.cc: trivial resolution --- src/osd/OSD.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0c01ba6168d..5f8109819a8 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -530,7 +530,7 @@ void OSDService::agent_entry() int max = g_conf->osd_agent_max_ops - agent_ops; agent_lock.Unlock(); if (!pg->agent_work(max)) { - dout(10) << __func__ << " " << *pg + dout(10) << __func__ << " " << pg->get_pgid() << " no agent_work, delay for " << g_conf->osd_agent_delay_time << " seconds" << dendl; -- 2.47.3