From 89044a6d76322898a3e62e8cc7c7d4523fd2fa83 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Fri, 2 May 2014 15:10:43 -0700
Subject: [PATCH] mon/PGMonitor: set tid on no-op PGStatsAck

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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index fdee216f22a91..ae8f6e70d6226 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -762,6 +762,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) {
-- 
2.39.5