From 320296189369fb46fb9935877cd58b6fa6c09d1a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Nov 2017 15:05:16 -0600
Subject: [PATCH] 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>
---
 src/osd/OSD.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cdd31cb9778..24c99f77a14 100644
--- 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()
-- 
2.39.5