From: Kefu Chai <kchai@redhat.com>
Date: Sat, 20 May 2017 05:07:24 +0000 (+0800)
Subject: mon/PGMonitor: assert(format_version == 1)
X-Git-Tag: v12.1.0~57^2~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15272%2Fhead;p=ceph.git

mon/PGMonitor: assert(format_version == 1)

we have been PGMonitor's formart_version has been 1 since v0.67
(dumpling). so let's drop it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 7b0e5247b087..d420d9eea49f 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -674,24 +674,6 @@ void PGMap::decode(bufferlist::iterator &bl)
   calc_stats();
 }
 
-void PGMap::dirty_all(Incremental& inc)
-{
-  inc.osdmap_epoch = last_osdmap_epoch;
-  inc.pg_scan = last_pg_scan;
-  inc.full_ratio = full_ratio;
-  inc.nearfull_ratio = nearfull_ratio;
-
-  for (ceph::unordered_map<pg_t,pg_stat_t>::const_iterator p = pg_stat.begin(); p != pg_stat.end(); ++p) {
-    inc.pg_stat_updates[p->first] = p->second;
-  }
-  for (ceph::unordered_map<int32_t, osd_stat_t>::const_iterator p = osd_stat.begin(); p != osd_stat.end(); ++p) {
-    assert(osd_epochs.count(p->first));
-    inc.update_stat(p->first,
-                    inc.get_osd_epochs().find(p->first)->second,
-                    p->second);
-  }
-}
-
 void PGMap::dump(Formatter *f) const
 {
   dump_basic(f);
diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index e2d01cd2a777..556cc8929bc2 100644
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -282,8 +282,6 @@ public:
   void encode(bufferlist &bl, uint64_t features=-1) const;
   void decode(bufferlist::iterator &bl);
 
-  void dirty_all(Incremental& inc);
-
   void dump(Formatter *f) const; 
   void dump_pool_stats(const OSDMap &osd_map, stringstream *ss, Formatter *f,
       bool verbose) const;
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index f2db6bbbf204..c764394d9d88 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -216,17 +216,7 @@ void PGMonitor::on_upgrade()
 void PGMonitor::upgrade_format()
 {
   unsigned current = 1;
-  assert(format_version <= current);
-  if (format_version == current)
-    return;
-
-  dout(1) << __func__ << " to " << current << dendl;
-
-  // upgrade by dirtying it all
-  pg_map.dirty_all(pending_inc);
-
-  format_version = current;
-  propose_pending();
+  assert(format_version == current);
 }
 
 void PGMonitor::post_paxos_update()