From: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
Date: Mon, 3 Jun 2019 19:23:45 +0000 (-0400)
Subject: mgr: Look at PG state when PG epoch >= OSDMap epoch
X-Git-Tag: v14.2.17~114^2~1^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50f4c0de636253c1237c25b67a57bfc19f54c90f;p=ceph.git

mgr: Look at PG state when PG epoch >= OSDMap epoch

add an if statement to only allow PGs to
only look at it's PG state when it's epoch
is greater than or equal to the OSDMap's
epoch.

cherry picked from commit 21e1caba6df9d591ebff54939d020ce0a3e57efe

Signed-off-by: Kamoltat <ksirivad@redhat.com>
---

diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py
index adee58749a11e..77df5d81bbde3 100644
--- a/src/pybind/mgr/progress/module.py
+++ b/src/pybind/mgr/progress/module.py
@@ -229,6 +229,9 @@ class PgRecoveryEvent(Event):
                 # The PG is gone!  Probably a pool was deleted. Drop it.
                 complete.add(pg)
                 continue
+            #Only checks the state of each PGs when it's epoch >= the OSDMap's epoch
+            if int(info['reported_epoch']) < int(latest_osd_map_epoch):
+                continue
 
             state = info['state']