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

osd: compensate for replicas with tail > last_complete

Browse Source 
Normally we shouldn't ever have a last_complete < log.tail (&& !backlog).
But maybe we do (old bugs, whatever; see #590).  In that case, the primary
can compensate by sending more log info to the replica.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-12-20 13:22:49 -08:00
parent b04b6f4823
commit 69940e2717
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osd/PG.cc
View File

@ -1855,13 +1855,24 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
}
else {
m = new MOSDPGLog(osd->osdmap->get_epoch(), info);
if (pi.last_update < log.tail) {
// summary/backlog
if (pi.log_tail > pi.last_complete && !pi.log_backlog) {
// the replica's tail is after it's last_complete and it has no backlog.
// ick, this shouldn't normally happen. but we can compensate!
dout(10) << "activate peer osd" << peer << " has last_complete < log tail and no backlog, compensating" << dendl;
if (log.tail >= pi.last_complete) {
// _our_ log is sufficient, phew!
m->log.copy_after(log, pi.last_complete);
} else {
assert(log.backlog);
m->log = log;
}
} else if (log.tail > pi.last_update) {
// our tail is too new; send the full backlog.
assert(log.backlog);
m->log = log;
} else {
// incremental log
assert(pi.last_update < info.last_update);
// send new stuff to append to replicas log
assert(info.last_update > pi.last_update);
m->log.copy_after(log, pi.last_update);
}
}