]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/PGMonitor: set tid on no-op PGStatsAck
authorSage Weil <sage@inktank.com>
Fri, 2 May 2014 22:10:43 +0000 (15:10 -0700)
committerSage Weil <sage@inktank.com>
Fri, 2 May 2014 22:55:01 +0000 (15:55 -0700)
The OSD needs to know the tid.  Both generally, and specifically because
the flush_pg_stats may be blocking on it.

Fixes: #8280
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 5a6ae2a978dcaf96ef89de3aaa74fe951a64def6)

src/mon/PGMonitor.cc

index 29c77dbe0ed2c9b1e96c70cf85a23600971ca19e..59e0297ae940d4eb4a9eb7e45721482f3df03bcd 100644 (file)
@@ -714,6 +714,7 @@ bool PGMonitor::prepare_pg_stats(MPGStats *stats)
   if (!pg_stats_have_changed(from, stats)) {
     dout(10) << " message contains no new osd|pg stats" << dendl;
     MPGStatsAck *ack = new MPGStatsAck;
+    ack->set_tid(stats->get_tid());
     for (map<pg_t,pg_stat_t>::const_iterator p = stats->pg_stat.begin();
         p != stats->pg_stat.end();
         ++p) {