From: Samuel Just <sjust@redhat.com>
Date: Tue, 22 Sep 2015 18:44:18 +0000 (-0700)
Subject: OSDService::agent_entry: don't use PG::operator<< without pg lock
X-Git-Tag: v0.94.6~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8ca88dd4b47b4956211d206b0d42112e5842d3f;p=ceph.git

OSDService::agent_entry: don't use PG::operator<< without pg lock

Fixes: #13199
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit d422f2820d5beee15117e166546a6386120e0349)

Conflicts:
	src/osd/OSD.cc: trivial resolution
---

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;