From 50f4c0de636253c1237c25b67a57bfc19f54c90f Mon Sep 17 00:00:00 2001 From: "Kamoltat (Junior) Sirivadhna" Date: Mon, 3 Jun 2019 15:23:45 -0400 Subject: [PATCH] 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 --- src/pybind/mgr/progress/module.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py index adee58749a1..77df5d81bbd 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'] -- 2.47.3