osd: be a bit more pedantic about pg epoch

Make sure PG has activated it before we mark it fully consumed.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cdd31cb9778d56c7b6baa1fda3bd8e633ce93fec..24c99f77a147f075ffcd3a102b53b2dfdcf5df93 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7810,8 +7810,8 @@ void OSD::advance_pg(
     lastmap = nextmap;
     handle.reset_tp_timeout();
   }
-  service.pg_update_epoch(pg->pg_id, lastmap->get_epoch());
   pg->handle_activate_map(rctx);
+  service.pg_update_epoch(pg->pg_id, lastmap->get_epoch());
 }
 
 void OSD::consume_map()