RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: only add pg peers if active

Browse Source 
We will soon be in this method for the waiting-for-healthy state.  As
a consequence, we need to remove any down peers.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-29 12:24:04 -07:00
parent b586f4a92d
commit a4d3b47a92
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/osd/OSD.cc
View File

@ -2314,23 +2314,25 @@ void OSD::maybe_update_heartbeat_peers()
heartbeat_epoch = osdmap->get_epoch();
// build heartbeat from set
for (hash_map<pg_t, PG*>::iterator i = pg_map.begin();
i != pg_map.end();
++i) {
PG *pg = i->second;
pg->heartbeat_peer_lock.Lock();
dout(20) << i->first << " heartbeat_peers " << pg->heartbeat_peers << dendl;
for (set<int>::iterator p = pg->heartbeat_peers.begin();
p != pg->heartbeat_peers.end();
++p)
if (osdmap->is_up(*p))
_add_heartbeat_peer(*p);
for (set<int>::iterator p = pg->probe_targets.begin();
p != pg->probe_targets.end();
++p)
if (osdmap->is_up(*p))
_add_heartbeat_peer(*p);
pg->heartbeat_peer_lock.Unlock();
if (is_active()) {
for (hash_map<pg_t, PG*>::iterator i = pg_map.begin();
i != pg_map.end();
++i) {
PG *pg = i->second;
pg->heartbeat_peer_lock.Lock();
dout(20) << i->first << " heartbeat_peers " << pg->heartbeat_peers << dendl;
for (set<int>::iterator p = pg->heartbeat_peers.begin();
p != pg->heartbeat_peers.end();
++p)
if (osdmap->is_up(*p))
_add_heartbeat_peer(*p);
for (set<int>::iterator p = pg->probe_targets.begin();
p != pg->probe_targets.end();
++p)
if (osdmap->is_up(*p))
_add_heartbeat_peer(*p);
pg->heartbeat_peer_lock.Unlock();
}
}
// include next and previous up osds to ensure we have a fully-connected set