From: Sage Weil <sage@redhat.com>
Date: Tue, 31 Jan 2017 19:03:04 +0000 (-0500)
Subject: osd/OSDMapMapping: disable up_rmap
X-Git-Tag: v12.0.1~343^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d2f9a4703c763208535383ebe58129b63dce9b6;p=ceph.git

osd/OSDMapMapping: disable up_rmap

The reverse mapping from up osds to pgs is not used; disable it for now.

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

diff --git a/src/osd/OSDMapMapping.cc b/src/osd/OSDMapMapping.cc
index 7ba53b2e77f6..55cd22428f02 100644
--- a/src/osd/OSDMapMapping.cc
+++ b/src/osd/OSDMapMapping.cc
@@ -54,13 +54,13 @@ void OSDMapMapping::update(const OSDMap& osdmap, pg_t pgid)
 void OSDMapMapping::_build_rmap(const OSDMap& osdmap)
 {
   acting_rmap.resize(osdmap.get_max_osd());
-  up_rmap.resize(osdmap.get_max_osd());
+  //up_rmap.resize(osdmap.get_max_osd());
   for (auto& v : acting_rmap) {
     v.resize(0);
   }
-  for (auto& v : up_rmap) {
-    v.resize(0);
-  }
+  //for (auto& v : up_rmap) {
+  //  v.resize(0);
+  //}
   for (auto& p : pools) {
     pg_t pgid(0, p.first);
     for (unsigned ps = 0; ps < p.second.pg_num; ++ps) {
@@ -71,9 +71,9 @@ void OSDMapMapping::_build_rmap(const OSDMap& osdmap)
 	  acting_rmap[row[4 + i]].push_back(pgid);
 	}
       }
-      for (int i = 0; i < row[3]; ++i) {
-	up_rmap[row[4 + p.second.size + i]].push_back(pgid);
-      }
+      //for (int i = 0; i < row[3]; ++i) {
+      //up_rmap[row[4 + p.second.size + i]].push_back(pgid);
+      //}
     }
   }
 }
diff --git a/src/osd/OSDMapMapping.h b/src/osd/OSDMapMapping.h
index bbc92794b462..cb9498c371a1 100644
--- a/src/osd/OSDMapMapping.h
+++ b/src/osd/OSDMapMapping.h
@@ -83,7 +83,7 @@ class OSDMapMapping {
 
   std::map<int64_t,PoolMapping> pools;
   std::vector<std::vector<pg_t>> acting_rmap;  // osd -> pg
-  std::vector<std::vector<pg_t>> up_rmap;  // osd -> pg
+  //unused: std::vector<std::vector<pg_t>> up_rmap;  // osd -> pg
   epoch_t epoch;
 
   void _init_mappings(const OSDMap& osdmap);
@@ -118,10 +118,12 @@ public:
     assert(osd < acting_rmap.size());
     return acting_rmap[osd];
   }
+  /* unsued
   const std::vector<pg_t>& get_osd_up_pgs(unsigned osd) {
     assert(osd < up_rmap.size());
     return up_rmap[osd];
   }
+  */
 
   void update(const OSDMap& map);
   void update(const OSDMap& map, pg_t pgid);