From: Sage Weil Date: Thu, 10 Aug 2017 19:00:46 +0000 (-0400) Subject: mgr/ClusterState: record osd_stat for out osds too X-Git-Tag: v13.0.0~107^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a7612d33d1e4184af7faa6712fc50d6487a09c40;p=ceph.git mgr/ClusterState: record osd_stat for out osds too I'm not quite sure why we were doing this. :/ Signed-off-by: Sage Weil --- diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc index 7e01a811ef158..b727ac1867e96 100644 --- a/src/mgr/ClusterState.cc +++ b/src/mgr/ClusterState.cc @@ -70,16 +70,8 @@ void ClusterState::ingest_pgstats(MPGStats *stats) Mutex::Locker l(lock); const int from = stats->get_orig_source().num(); - bool is_in = false; - objecter->with_osdmap([&is_in, from](const OSDMap &osd_map){ - is_in = osd_map.is_in(from); - }); - - if (is_in) { - pending_inc.update_stat(from, stats->epoch, std::move(stats->osd_stat)); - } else { - pending_inc.update_stat(from, stats->epoch, osd_stat_t()); - } + + pending_inc.update_stat(from, stats->epoch, std::move(stats->osd_stat)); for (auto p : stats->pg_stat) { pg_t pgid = p.first;