X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Fosd%2FOSDMapMapping.cc;fp=src%2Fceph%2Fsrc%2Fosd%2FOSDMapMapping.cc;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=bf9f4f99c38b0f4a35f94164c60809835e9d7514;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/osd/OSDMapMapping.cc b/src/ceph/src/osd/OSDMapMapping.cc
deleted file mode 100644
index bf9f4f9..0000000
--- a/src/ceph/src/osd/OSDMapMapping.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "OSDMapMapping.h"
-#include "OSDMap.h"
-
-#define dout_subsys ceph_subsys_mon
-
-#include "common/debug.h"
-
-MEMPOOL_DEFINE_OBJECT_FACTORY(OSDMapMapping, osdmapmapping,
-			      osdmap_mapping);
-
-// ensure that we have a PoolMappings for each pool and that
-// the dimensions (pg_num and size) match up.
-void OSDMapMapping::_init_mappings(const OSDMap& osdmap)
-{
-  num_pgs = 0;
-  auto q = pools.begin();
-  for (auto& p : osdmap.get_pools()) {
-    num_pgs += p.second.get_pg_num();
-    // drop unneeded pools
-    while (q != pools.end() && q->first < p.first) {
-      q = pools.erase(q);
-    }
-    if (q != pools.end() && q->first == p.first) {
-      if (q->second.pg_num != p.second.get_pg_num() ||
-	  q->second.size != p.second.get_size()) {
-	// pg_num changed
-	q = pools.erase(q);
-      } else {
-	// keep it
-	++q;
-	continue;
-      }
-    }
-    pools.emplace(p.first, PoolMapping(p.second.get_size(),
-				       p.second.get_pg_num()));
-  }
-  pools.erase(q, pools.end());
-  assert(pools.size() == osdmap.get_pools().size());
-}
-
-void OSDMapMapping::update(const OSDMap& osdmap)
-{
-  _start(osdmap);
-  for (auto& p : osdmap.get_pools()) {
-    _update_range(osdmap, p.first, 0, p.second.get_pg_num());
-  }
-  _finish(osdmap);
-  //_dump();  // for debugging
-}
-
-void OSDMapMapping::update(const OSDMap& osdmap, pg_t pgid)
-{
-  _update_range(osdmap, pgid.pool(), pgid.ps(), pgid.ps() + 1);
-}
-
-void OSDMapMapping::_build_rmap(const OSDMap& osdmap)
-{
-  acting_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& p : pools) {
-    pg_t pgid(0, p.first);
-    for (unsigned ps = 0; ps < p.second.pg_num; ++ps) {
-      pgid.set_ps(ps);
-      int32_t *row = &p.second.table[p.second.row_size() * ps];
-      for (int i = 0; i < row[2]; ++i) {
-	if (row[4 + i] != CRUSH_ITEM_NONE) {
-	  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);
-      //}
-    }
-  }
-}
-
-void OSDMapMapping::_finish(const OSDMap& osdmap)
-{
-  _build_rmap(osdmap);
-  epoch = osdmap.get_epoch();
-}
-
-void OSDMapMapping::_dump()
-{
-  for (auto& p : pools) {
-    cout << "pool " << p.first << std::endl;
-    for (unsigned i = 0; i < p.second.table.size(); ++i) {
-      cout << " " << p.second.table[i];
-      if (i % p.second.row_size() == p.second.row_size() - 1)
-	cout << std::endl;
-    }
-  }
-}
-
-void OSDMapMapping::_update_range(
-  const OSDMap& osdmap,
-  int64_t pool,
-  unsigned pg_begin,
-  unsigned pg_end)
-{
-  auto i = pools.find(pool);
-  assert(i != pools.end());
-  assert(pg_begin <= pg_end);
-  assert(pg_end <= i->second.pg_num);
-  for (unsigned ps = pg_begin; ps < pg_end; ++ps) {
-    vector<int> up, acting;
-    int up_primary, acting_primary;
-    osdmap.pg_to_up_acting_osds(
-      pg_t(ps, pool),
-      &up, &up_primary, &acting, &acting_primary);
-    i->second.set(ps, std::move(up), up_primary,
-		  std::move(acting), acting_primary);
-  }
-}
-
-// ---------------------------
-
-void ParallelPGMapper::Job::finish_one()
-{
-  Context *fin = nullptr;
-  {
-    Mutex::Locker l(lock);
-    if (--shards == 0) {
-      if (!aborted) {
-	finish = ceph_clock_now();
-	complete();
-      }
-      cond.Signal();
-      fin = onfinish;
-      onfinish = nullptr;
-    }
-  }
-  if (fin) {
-    fin->complete(0);
-  }
-}
-
-void ParallelPGMapper::WQ::_process(Item *i, ThreadPool::TPHandle &h)
-{
-  ldout(m->cct, 20) << __func__ << " " << i->job << " " << i->pool
-		    << " [" << i->begin << "," << i->end << ")" << dendl;
-  i->job->process(i->pool, i->begin, i->end);
-  i->job->finish_one();
-  delete i;
-}
-
-void ParallelPGMapper::queue(
-  Job *job,
-  unsigned pgs_per_item)
-{
-  bool any = false;
-  for (auto& p : job->osdmap->get_pools()) {
-    for (unsigned ps = 0; ps < p.second.get_pg_num(); ps += pgs_per_item) {
-      unsigned ps_end = MIN(ps + pgs_per_item, p.second.get_pg_num());
-      job->start_one();
-      wq.queue(new Item(job, p.first, ps, ps_end));
-      ldout(cct, 20) << __func__ << " " << job << " " << p.first << " [" << ps
-		     << "," << ps_end << ")" << dendl;
-      any = true;
-    }
-  }
-  assert(any);
-}