From: David Zafman <dzafman@redhat.com>
Date: Sat, 8 Aug 2015 22:40:46 +0000 (-0700)
Subject: mon: Improve PGMap::generate_test_instances(), build map per incremental
X-Git-Tag: v9.1.0~393^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5535%2Fhead;p=ceph.git

mon: Improve PGMap::generate_test_instances(), build map per incremental

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 205ebadaba70..0b4c8ddcf885 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1532,12 +1532,15 @@ void PGMap::print_oneline_summary(Formatter *f, ostream *out) const
 
 void PGMap::generate_test_instances(list<PGMap*>& o)
 {
-  o.push_back(new PGMap);
   o.push_back(new PGMap);
   list<Incremental*> inc;
   Incremental::generate_test_instances(inc);
+  delete inc.front();
   inc.pop_front();
   while (!inc.empty()) {
+    PGMap *pmp = new PGMap();
+    *pmp = *o.back();
+    o.push_back(pmp);
     o.back()->apply_incremental(NULL, *inc.front());
     delete inc.front();
     inc.pop_front();