From f1015b4da74c65dd518d568a327f92557f3752ce Mon Sep 17 00:00:00 2001 From: "Kamoltat (Junior) Sirivadhna" Date: Tue, 4 Jun 2019 10:32:04 -0400 Subject: [PATCH] mgr: Look at PG state when PG epoch >= OSDMap epoch add a property in pg_update that gets the (current) OSDMap when the event is created, and compare PG epoch with OSDMap epoch. Also made some changes on the spacing of things. (cherry picked from commit f618e56c93ad82a20ab844fddc3d2ded42f2a48e) Signed-off-by: Kamoltat --- src/pybind/mgr/progress/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py index 77df5d81bbd..32bd82c5f31 100644 --- a/src/pybind/mgr/progress/module.py +++ b/src/pybind/mgr/progress/module.py @@ -229,8 +229,8 @@ 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): + # Only checks the state of each PGs when it's epoch >= the OSDMap's epoch + if int(info['reported_epoch']) < int(start_epoch): continue state = info['state'] -- 2.47.3