From a89281ffbb50a4dfc700398e864138b5faaf00f5 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Mon, 25 Mar 2019 18:24:16 +0800 Subject: [PATCH] osd/OSDMap: add log for better debugging Signed-off-by: xie xingguo --- src/osd/OSDMap.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 41ec432c63d57..0c10811a88f58 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -4354,15 +4354,16 @@ int OSDMap::calc_pg_upmaps( map osd_weight; for (auto& i : pools) { if (!only_pools.empty() && !only_pools.count(i.first)) - continue; + continue; for (unsigned ps = 0; ps < i.second.get_pg_num(); ++ps) { - pg_t pg(ps, i.first); - vector up; - tmp.pg_to_up_acting_osds(pg, &up, nullptr, nullptr, nullptr); - for (auto osd : up) { - if (osd != CRUSH_ITEM_NONE) - pgs_by_osd[osd].insert(pg); - } + pg_t pg(ps, i.first); + vector up; + tmp.pg_to_up_acting_osds(pg, &up, nullptr, nullptr, nullptr); + ldout(cct, 20) << __func__ << " " << pg << " up " << up << dendl; + for (auto osd : up) { + if (osd != CRUSH_ITEM_NONE) + pgs_by_osd[osd].insert(pg); + } } total_pgs += i.second.get_size() * i.second.get_pg_num(); @@ -4371,7 +4372,10 @@ int OSDMap::calc_pg_upmaps( i.second.get_type(), i.second.get_size()); tmp.crush->get_rule_weight_osd_map(ruleno, &pmap); - ldout(cct,30) << __func__ << " pool " << i.first << " ruleno " << ruleno << dendl; + ldout(cct,20) << __func__ << " pool " << i.first + << " ruleno " << ruleno + << " weight-map " << pmap + << dendl; for (auto p : pmap) { auto adjusted_weight = tmp.get_weightf(p.first) * p.second; if (adjusted_weight == 0) { -- 2.39.5