From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Sep 2018 14:01:02 +0000 (-0500)
Subject: osd/PG: write pg epoch when resurrecting pg after delete vs merge race
X-Git-Tag: v14.0.1~279^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24061%2Fhead;p=ceph.git

osd/PG: write pg epoch when resurrecting pg after delete vs merge race

Fixes: http://tracker.ceph.com/issues/35923
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a2466a99cb7d..7b4f42c32279 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6741,6 +6741,7 @@ void PG::_delete_some(ObjectStore::Transaction *t)
 	      info.pgid,
 	      info.pgid.get_split_bits(pool.info.get_pg_num()));
       _init(*t, info.pgid, &pool.info);
+      last_epoch = 0;  // to ensure pg epoch is also written
       dirty_info = true;
       dirty_big_info = true;
     } else {