From: Sage Weil <sage@redhat.com>
Date: Thu, 16 Jan 2020 22:11:07 +0000 (-0600)
Subject: osd/PeeringState: maximize log entries sent during backfill
X-Git-Tag: v15.1.0~124^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0eba9b9c29d834d405a9d5de52feacc19cccec7;p=ceph.git

osd/PeeringState: maximize log entries sent during backfill

Send as much log as we can during backfill so that dup op detection works
as well as it can.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 8f0371e531e8..aa9e047c9337 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -2484,7 +2484,8 @@ void PeeringState::activate(
 	  last_peering_reset /* epoch to create pg at */);
 
 	// send some recent log, so that op dup detection works well.
-	m->log.copy_up_to(cct, pg_log.get_log(), cct->_conf->osd_min_pg_log_entries);
+	m->log.copy_up_to(cct, pg_log.get_log(),
+			  cct->_conf->osd_max_pg_log_entries);
 	m->info.log_tail = m->log.tail;
 	pi.log_tail = m->log.tail;  // sigh...