From fed94eb2ff4e9ecad01b9b48b03a70fe198cf8e8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Aug 2008 10:48:52 -0700 Subject: [PATCH] osd: don't rebuild backlog if we already have it --- src/osd/PG.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b6c3a5c15e10f..838613ae479b5 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -177,12 +177,16 @@ void PG::proc_replica_log(Log &olog, Missing& omissing, int from) eversion_t lu = peer_info[from].last_update; while (pp != olog.log.rend()) { if (!log.logged_object(pp->oid)) { - dout(10) << " divergent " << *pp << " not in our log, generating backlog" << dendl; - //dout(0) << "log" << dendl; - //log.print(*_dout); - //dout(0) << "olog" << dendl; - //olog.print(*_dout); - generate_backlog(); + if (!log.backlog) { + dout(10) << " divergent " << *pp << " not in our log, generating backlog" << dendl; + //dout(0) << "log" << dendl; + //log.print(*_dout); + //dout(0) << "olog" << dendl; + //olog.print(*_dout); + generate_backlog(); + } else { + dout(10) << " divergent " << *pp << " not in our log, already have backlog" << dendl; + } } if (!log.objects.count(pp->oid)) { -- 2.39.5