From: Chang Liu <liuchang0812@gmail.com>
Date: Thu, 18 Jan 2018 14:50:25 +0000 (+0800)
Subject: mon: do not use per_pool_sum_delta to show recovery summary
X-Git-Tag: v12.2.3~64^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e94900c7caa2bd920684073704bc688249bc0591;p=ceph.git

mon: do not use per_pool_sum_delta to show recovery summary

Fixes: http://tracker.ceph.com/issues/22727

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit 5981ddc1992190431743ce1f0b834fb8899b6811)
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index cf820e33135c..b5a907df04e1 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -458,11 +458,11 @@ void PGMapDigest::pool_recovery_rate_summary(Formatter *f, ostream *out,
 void PGMapDigest::pool_recovery_summary(Formatter *f, list<string> *psl,
                                   uint64_t poolid) const
 {
-  auto p = per_pool_sum_delta.find(poolid);
-  if (p == per_pool_sum_delta.end())
+  auto p = pg_pool_sum.find(poolid);
+  if (p == pg_pool_sum.end())
     return;
 
-  recovery_summary(f, psl, p->second.first);
+  recovery_summary(f, psl, p->second);
 }
 
 void PGMapDigest::client_io_rate_summary(Formatter *f, ostream *out,