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

Merge pull request #17752 from XinzeChi/wip-force-recovery

Browse Source 
osd: set min_version to newest version in maybe_force_recovery

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-10-02 11:35:32 +08:00 committed by GitHub
commit 002467953d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osd/PrimaryLogPG.cc
View File

@ -709,9 +709,9 @@ void PrimaryLogPG::maybe_force_recovery()
return;
// find the oldest missing object
version_t min_version = 0;
version_t min_version = pg_log.get_log().head.version;
hobject_t soid;
if (!pg_log.get_missing().get_items().empty()) {
if (!pg_log.get_missing().get_rmissing().empty()) {
min_version = pg_log.get_missing().get_rmissing().begin()->first;
soid = pg_log.get_missing().get_rmissing().begin()->second;
}
@ -722,10 +722,14 @@ void PrimaryLogPG::maybe_force_recovery()
if (*it == get_primary()) continue;
pg_shard_t peer = *it;
if (peer_missing.count(peer) &&
!peer_missing[peer].get_items().empty() &&
min_version > peer_missing[peer].get_rmissing().begin()->first) {
min_version = peer_missing[peer].get_rmissing().begin()->first;
soid = peer_missing[peer].get_rmissing().begin()->second;
!peer_missing[peer].get_rmissing().empty()) {
const auto& min_obj = peer_missing[peer].get_rmissing().begin();
dout(20) << __func__ << " peer " << peer << " min_version " << min_obj->first
<< " oid " << min_obj->second << dendl;
if (min_version > min_obj->first) {
min_version = min_obj->first;
soid = min_obj->second;
}
}
}