PG.cc:

	sub_op_scrub must set finalizing_scrub on the replica
	before waiting for last_update_applied to catch up to
	info.last_update.

Signed-off-by: Samuel Just <samuelj@hq.newdream.net>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3f4fad4b537c3556a7fc89594bc3c24bcd805098..76e2a05898f035eeb45c55e2c0f83181eb294d78 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2759,6 +2759,7 @@ void PG::sub_op_scrub(MOSDSubOp *op)
   ScrubMap map;
   if (op->version > eversion_t()) {
     epoch_t epoch = info.history.same_acting_since;
+    finalizing_scrub = 1;
     while (last_update_applied != info.last_update) {
       wait();
       if (epoch != info.history.same_acting_since ||
@@ -2768,6 +2769,7 @@ void PG::sub_op_scrub(MOSDSubOp *op)
       }
     }
     build_inc_scrub_map(map, op->version);
+    finalizing_scrub = 0;
   } else {
     build_scrub_map(map);
   }