RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8810 from xiexingguo/xxg-wip-fixgotfullmap

Browse Source 
osd: fix problematic got_full_map() logic

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/
This commit is contained in:
Yuri Weinstein 2016-05-09 09:09:26 -07:00
commit e4fa44cd48
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osd/OSD.cc
View File

@ -5031,23 +5031,18 @@ void OSD::got_full_map(epoch_t e)
<< ", ignoring" << dendl;
return;
}
if (e > requested_full_first) {
if (e >= requested_full_last) {
dout(10) << __func__ << " " << e << ", requested " << requested_full_first
<< ".." << requested_full_last << ", resetting" << dendl;
requested_full_first = requested_full_last = 0;
return;
}
if (requested_full_first == requested_full_last) {
dout(10) << __func__ << " " << e << ", requested " << requested_full_first
<< ".." << requested_full_last
<< ", now done" << dendl;
requested_full_first = requested_full_last = 0;
} else {
dout(10) << __func__ << " " << e << ", requested " << requested_full_first
<< ".." << requested_full_last
<< ", still need more" << dendl;
++requested_full_first;
}
requested_full_first = e + 1;
dout(10) << __func__ << " " << e << ", requested " << requested_full_first
<< ".." << requested_full_last
<< ", still need more" << dendl;
}
void OSD::requeue_failures()