From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Nov 2017 21:05:16 +0000 (-0600)
Subject: osd: be a bit more pedantic about pg epoch
X-Git-Tag: v13.0.2~840^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=320296189369fb46fb9935877cd58b6fa6c09d1a;p=ceph.git

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 cdd31cb9778d..24c99f77a147 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()