]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDService::agent_entry: don't use PG::operator<< without pg lock 6146/head
authorSamuel Just <sjust@redhat.com>
Tue, 22 Sep 2015 18:44:18 +0000 (11:44 -0700)
committerLoic Dachary <ldachary@redhat.com>
Fri, 2 Oct 2015 11:01:12 +0000 (13:01 +0200)
Fixes: #13199
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit d422f2820d5beee15117e166546a6386120e0349)

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

src/osd/OSD.cc

index 0c01ba6168df6e0688ba78defc91bc6082919a2e..5f8109819a815105812c077e140be291b1d50c19 100644 (file)
@@ -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;