Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "PrimaryLogPG::failed_push: update missing as well" #13090

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Revert "PrimaryLogPG::failed_push: update missing as well" #13090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/osd/PG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,12 +436,6 @@ class PG : protected DoutPrefixProvider {
ThreadPool::TPHandle* handle ///< [in] ThreadPool handle
);

/// Returns version needed
eversion_t get_version_needed(const hobject_t &hoid) const {
assert(needs_recovery_map.count(hoid));
return needs_recovery_map.at(hoid).need;
}

/// Uses osdmap to update structures for now down sources
void check_recovery_sources(const OSDMapRef& osdmap);

Expand Down
6 changes: 1 addition & 5 deletions src/osd/PrimaryLogPG.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9546,12 +9546,8 @@ void PrimaryLogPG::failed_push(const list<pg_shard_t> &from, const hobject_t &so
requeue_ops(blocked_ops);
}
recovering.erase(soid);
for (auto&& i : from) {
for (auto&& i : from)
missing_loc.remove_location(soid, i);
auto miter = peer_missing.find(i);
assert(miter != peer_missing.end());
miter->second.add(soid, missing_loc.get_version_needed(soid), eversion_t());
}
dout(0) << __func__ << " " << soid << " from shard " << from
<< ", reps on " << missing_loc.get_locations(soid)
<< " unfound? " << missing_loc.is_unfound(soid) << dendl;
Expand Down