]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: simplify heartbeat checks
authorSage Weil <sage@newdream.net>
Thu, 22 Jul 2010 22:55:23 +0000 (15:55 -0700)
committerSage Weil <sage@newdream.net>
Fri, 23 Jul 2010 22:50:05 +0000 (15:50 -0700)
commit622e9b479e1ea3ecc86a00166d722f302da28ae4
treef824038db2543bcafc5fe1626028fc5660ebbfe8
parent9e3650becda19cae331a94549c9795e2f110dfa1
osd: simplify heartbeat checks

- Only check heartbeats when we have heartbeat_lock and osdmap rdlocked,
and thus _know_ heartbeat info and map are in sync.  Drop unnecessary
consistency checks.
- Check heartbeats in tick(), since the heartbeat thread may miss it if
it's unlucky.
src/osd/OSD.cc
src/osd/OSD.h