RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

PG: do not block writes on async_recovery_targets

Browse Source 
Signed-off-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Neha Ojha 2018-01-05 12:32:23 -08:00
parent 3b5323d149
commit 1e2e58c730
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osd/PrimaryLogPG.cc
View File

@ -626,10 +626,15 @@ bool PrimaryLogPG::is_degraded_or_backfilling_object(const hobject_t& soid)
if (*i == get_primary()) continue;
pg_shard_t peer = *i;
auto peer_missing_entry = peer_missing.find(peer);
// If an object is missing on an async_recovery_target, return false.
// This will not block the op and the object is async recovered later.
if (peer_missing_entry != peer_missing.end() &&
peer_missing_entry->second.get_items().count(soid))
return true;
peer_missing_entry->second.get_items().count(soid)) {
if (async_recovery_targets.count(peer))
return false;
else
return true;
}
// Object is degraded if after last_backfill AND
// we are backfilling it
if (is_backfill_targets(peer) &&
@ -10073,6 +10078,15 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx)
repop->rep_tid,
ctx->reqid,
ctx->op);
for (set<pg_shard_t>::iterator i = async_recovery_targets.begin();
i != async_recovery_targets.end();
++i) {
if (*i == get_primary() || !peer_missing[*i].is_missing(soid)) continue;
for (auto &&entry: ctx->log) {
peer_missing[*i].add_next_event(entry);
}
}
}
PrimaryLogPG::RepGather *PrimaryLogPG::new_repop(

3
src/osd/ReplicatedBackend.cc
View File

@ -1004,9 +1004,6 @@ void ReplicatedBackend::do_repop(OpRequestRef op)
// sanity checks
assert(m->map_epoch >= get_info().history.same_interval_since);
// we better not be missing this.
assert(!parent->get_log().get_missing().is_missing(soid));
parent->maybe_preempt_replica_scrub(soid);
int ackerosd = m->get_source().num();