From 8bbc7cba5f9c29183d2db59cc4ae015025d03111 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Thu, 28 Sep 2023 17:52:11 +0000 Subject: [PATCH] osd: fix logic in check_pg_upmaps 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 (cherry picked from commit ae11bbe6b2805740d3621cc47c68a5f0da493df0) --- src/osd/OSDMap.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 8142a4ae83399..7a97f33e3786d 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -2145,8 +2145,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 -- 2.39.5