RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-06 17:44:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from tchaikov/wip-47380

Browse Source 
mon/OSDMonitor: drop stale failure_info even if can_mark_down()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2021-05-27 15:19:12 +08:00 committed by GitHub
commit 1c8ebd6bf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

5
src/mon/OSDMonitor.cc
View File

@ -3181,8 +3181,9 @@ bool OSDMonitor::check_failures(utime_t now)
auto p = failure_info.begin();
while (p != failure_info.end()) {
auto& [target_osd, fi] = *p;
if (can_mark_down(target_osd)) {
found_failure |= check_failure(now, target_osd, fi);
if (can_mark_down(target_osd) &&
check_failure(now, target_osd, fi)) {
found_failure = true;
++p;
} else if (is_failure_stale(now, fi)) {
dout(10) << " dropping stale failure_info for osd." << target_osd