From 9288f0e0f3c4d075da6cb664466f82742b2852d8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 5 Dec 2011 15:24:01 -0800 Subject: [PATCH] osd: advance last_backfill by keys only This ensures that transactions are never split by last_backfill. Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cb946b2031ff1..09172247aa818 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -5394,8 +5394,10 @@ int ReplicatedPG::recover_backfill(int max) } } - if (pinfo.last_backfill < pbi.begin) { - pinfo.last_backfill = pbi.begin; + hobject_t bound = pbi.begin; + bound.back_up_to_bounding_key; + if (pinfo.last_backfill < bound) { + pinfo.last_backfill = bound; dout(10) << " peer osd." << backfill_target << " info.last_backfill now " << pinfo.last_backfill << dendl; -- 2.39.5