]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: fix logic in check_pg_upmaps
authorLaura Flores <lflores@ibm.com>
Thu, 28 Sep 2023 17:52:11 +0000 (17:52 +0000)
committerLaura Flores <lflores@ibm.com>
Wed, 4 Oct 2023 14:36:23 +0000 (14:36 +0000)
The logic was changed in check_pg_upmaps
in a Reef refactor, which results in recommendations
made by the upmap balancer even when it says there are
no optimizations.

Fixes: https://tracker.ceph.com/issues/63029
Signed-off-by: Laura Flores <lflores@ibm.com>
src/osd/OSDMap.cc

index 4a2d400b6703486e387599c17125204a9569341b..ce199e8ee8ac6eff0b5be411a0ef169c69f09eae 100644 (file)
@@ -2157,8 +2157,8 @@ bool OSDMap::check_pg_upmaps(
                        << j->first << " " << j->second
                        << dendl;
         to_cancel->push_back(pg);
-      } else {
-        //Josh--check partial no-op here.
+      } else if (newmap != j->second) {
+        // check partial no-op here.
         ldout(cct, 10) << __func__ << " simplifying partially no-op pg_upmap_items "
                        << j->first << " " << j->second
                        << " -> " << newmap