mon: feed MPGStats tids back through the MPGStatsAck

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index 3fc666067e8cd7e1b0edfa032a1c576216d085a8..2478ee530bffcd51cc109ff6e78ee19350fb2738 100644 (file)
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -36,7 +36,7 @@ private:
 public:
   const char *get_type_name() { return "pg_stats"; }
   void print(ostream& out) {
-    out << "pg_stats(" << pg_stat.size() << " pgs v " << version << ")";
+    out << "pg_stats(" << pg_stat.size() << " pgs tid " << get_tid() << " v " << version << ")";
   }
 
   void encode_payload(CephContext *cct) {

diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h
index 9ca1c72fb6632faf28cdb1f6dec4ef5a8fef28d5..95eea72c7e21e120d59815ae09c43def0747c352 100644 (file)
--- a/src/messages/MPGStatsAck.h
+++ b/src/messages/MPGStatsAck.h
@@ -29,7 +29,7 @@ private:
 public:
   const char *get_type_name() { return "pg_stats_ack"; }
   void print(ostream& out) {
-    out << "pg_stats_ack(" << pg_stat.size() << " pgs)";
+    out << "pg_stats_ack(" << pg_stat.size() << " pgs tid " << get_tid() << ")";
   }
 
   void encode_payload(CephContext *cct) {

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 909aa6b348a99a5e490e37c47c89b637a9b55e02..dfb4165aa429a198998f5b5c4e4a40124622b4c1 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -446,6 +446,7 @@ bool PGMonitor::prepare_pg_stats(MPGStats *stats)
 
   // pg stats
   MPGStatsAck *ack = new MPGStatsAck;
+  ack->set_tid(stats->get_tid());
   for (map<pg_t,pg_stat_t>::iterator p = stats->pg_stat.begin();
        p != stats->pg_stat.end();
        p++) {