diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-29 13:15:41 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-29 22:43:49 -0700 |
| commit | 04aa2b5edf72eb59a5dc688475df59dda25a3cac (patch) | |
| tree | 68dedfd2cf7756ba55db4501e4162be7c953aba4 /src/osd/OSD.cc | |
| parent | 28ea184d3a37fa8d878c82571ae64607c6717b43 (diff) | |
| download | ceph-04aa2b5edf72eb59a5dc688475df59dda25a3cac.tar.gz | |
osd: distinguish between definitely healthy and definitely not unhealthy
is_unhealthy() will assume they are healthy for some period after we
send our first ping attempt. is_healthy() is now a strict check that we
know they are healthy.
Switch the failure report check to use is_unhealthy(); use is_healthy()
everywhere else, including the waiting-for-healthy pre-boot checks.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/osd/OSD.cc')
| -rw-r--r-- | src/osd/OSD.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0e65172723c..f08a63a8ae3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2592,7 +2592,7 @@ void OSD::heartbeat_check() << " last_rx_back " << p->second.last_rx_back << " last_rx_front " << p->second.last_rx_front << dendl; - if (!p->second.is_healthy(cutoff)) { + if (p->second.is_unhealthy(cutoff)) { if (p->second.last_rx_back == utime_t() || p->second.last_rx_front == utime_t()) { derr << "heartbeat_check: no reply from osd." << p->first |