mon: clean up PGMapDigest encoding

Remove compat cruft due to intitial testing on bigbang.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index 9a6f3bae061dfb1d5aeaa5fb1c4cae936c8d21ed..b82ce6084ceeee930d51a2f79984ffd90c5ca674 100644 (file)
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -83,10 +83,7 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap)
   if (version) {
     assert(bl.length());
     auto p = bl.begin();
-    bufferlist digestbl;
-    ::decode(digestbl, p);
-    auto q = digestbl.begin();
-    ::decode(digest, q);
+    ::decode(digest, p);
     ::decode(health_summary, p);
     ::decode(health_detail, p);
   }
@@ -104,9 +101,8 @@ void MgrStatMonitor::encode_pending(MonitorDBStore::TransactionRef t)
 {
   ++version;
   dout(10) << " " << version << dendl;
-  bufferlist digestbl, bl;
-  ::encode(pending_digest, digestbl, mon->get_quorum_con_features());
-  ::encode(digestbl, bl);
+  bufferlist bl;
+  ::encode(pending_digest, bl, mon->get_quorum_con_features());
   ::encode(pending_health_summary, bl);
   ::encode(pending_health_detail, bl);
   put_version(t, version, bl);

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 1dbb8d116a94dd38d943b39c9f4e5bb9bad9c19c..5eddb50200ac4211c5a4c31e944a56209d2abcbc 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -25,48 +25,44 @@ MEMPOOL_DEFINE_OBJECT_FACTORY(PGMap::Incremental, pgmap_inc, pgmap);
 void PGMapDigest::encode(bufferlist& bl, uint64_t features) const
 {
   // NOTE: see PGMap::encode_digest
-  ENCODE_START(6, 1, bl);
+  ENCODE_START(1, 1, bl);
   ::encode(num_pg, bl);
   ::encode(num_pg_active, bl);
+  ::encode(num_pg_unknown, bl);
   ::encode(num_osd, bl);
-  unordered_map<int32_t,osd_stat_t> osd_stat_temp;
-  ::encode(osd_stat_temp, bl);
   ::encode(pg_pool_sum, bl, features);
-  ::encode(osd_sum, bl);
   ::encode(pg_sum, bl, features);
+  ::encode(osd_sum, bl);
   ::encode(num_pg_by_state, bl);
   ::encode(num_pg_by_osd, bl);
-  ::encode(osd_last_seq, bl);
   ::encode(num_pg_by_pool, bl);
+  ::encode(osd_last_seq, bl);
   ::encode(per_pool_sum_delta, bl, features);
   ::encode(per_pool_sum_deltas_stamps, bl);
   ::encode(pg_sum_delta, bl, features);
   ::encode(stamp_delta, bl);
-  ::encode(num_pg_unknown, bl);
   ::encode(avail_space_by_rule, bl);
   ENCODE_FINISH(bl);
 }
 
 void PGMapDigest::decode(bufferlist::iterator& p)
 {
-  DECODE_START(6, p);
+  DECODE_START(1, p);
   ::decode(num_pg, p);
   ::decode(num_pg_active, p);
+  ::decode(num_pg_unknown, p);
   ::decode(num_osd, p);
-  unordered_map<int32_t,osd_stat_t> osd_stat_temp;
-  ::decode(osd_stat_temp, p);
   ::decode(pg_pool_sum, p);
-  ::decode(osd_sum, p);
   ::decode(pg_sum, p);
+  ::decode(osd_sum, p);
   ::decode(num_pg_by_state, p);
   ::decode(num_pg_by_osd, p);
-  ::decode(osd_last_seq, p);
   ::decode(num_pg_by_pool, p);
+  ::decode(osd_last_seq, p);
   ::decode(per_pool_sum_delta, p);
   ::decode(per_pool_sum_deltas_stamps, p);
   ::decode(pg_sum_delta, p);
   ::decode(stamp_delta, p);
-  ::decode(num_pg_unknown, p);
   ::decode(avail_space_by_rule, p);
   DECODE_FINISH(p);
 }