Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon/OSDMonitor: Comment out unused function #20275

Merged
merged 1 commit into from
Feb 11, 2018
Merged

mon/OSDMonitor: Comment out unused function #20275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/mon/OSDMonitor.cc
View file
Open in desktop
Expand Up @@ -1346,23 +1346,6 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
encode_health(next, t);
}

void OSDMonitor::trim_creating_pgs(creating_pgs_t* creating_pgs,
const ceph::unordered_map<pg_t,pg_stat_t>& pg_stat)
{
auto p = creating_pgs->pgs.begin();
while (p != creating_pgs->pgs.end()) {
auto q = pg_stat.find(p->first);
if (q != pg_stat.end() &&
!(q->second.state & PG_STATE_CREATING)) {
dout(20) << __func__ << " pgmap shows " << p->first << " is created"
<< dendl;
p = creating_pgs->pgs.erase(p);
} else {
++p;
}
}
}

int OSDMonitor::load_metadata(int osd, map<string, string>& m, ostream *err)
{
bufferlist bl;
Expand Down
2 changes: 0 additions & 2 deletions src/mon/OSDMonitor.h
View file
Open in desktop
Expand Up @@ -465,8 +465,6 @@ class OSDMonitor : public PaxosService {

creating_pgs_t update_pending_pgs(const OSDMap::Incremental& inc,
const OSDMap& nextmap);
void trim_creating_pgs(creating_pgs_t *creating_pgs,
const ceph::unordered_map<pg_t,pg_stat_t>& pgm);
unsigned scan_for_creating_pgs(
const mempool::osdmap::map<int64_t,pg_pool_t>& pools,
const mempool::osdmap::set<int64_t>& removed_pools,
Expand Down
6 changes: 0 additions & 6 deletions src/osd/OSDMapMapping.h
View file
Open in desktop
Expand Up @@ -293,12 +293,6 @@ class OSDMapMapping {
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);
Expand Down