RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: send sufficient log to compensate for replicas with last_complate < log.tail

Browse Source 
If a replica has last_complete < log.tail and no backlog, send enough log
for them to get back into a consistent state.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-12-24 08:27:38 -08:00
parent b40e7dc0f7
commit 78f35a6450
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osd/PG.cc
View File

@ -1840,8 +1840,12 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
PG::Info& pi = peer_info[peer];
MOSDPGLog *m = 0;
if (pi.last_update == info.last_update) {
dout(10) << "activate peer osd" << peer << " " << pi << dendl;
bool need_old_log_entries = pi.log_tail > pi.last_complete && !pi.log_backlog;
if (pi.last_update == info.last_update && !need_old_log_entries) {
// empty log
if (activator_map) {
dout(10) << "activate peer osd" << peer << " is up to date, queueing in pending_activators" << dendl;
@ -1855,7 +1859,7 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
}
else {
m = new MOSDPGLog(osd->osdmap->get_epoch(), info);
if (pi.log_tail > pi.last_complete && !pi.log_backlog) {
if (need_old_log_entries) {
// 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;