From: Alex Ainscow <aainscow@uk.ibm.com>
Date: Tue, 19 May 2026 16:38:35 +0000 (+0100)
Subject: osd: get_primary_shard should not call pgtemp_undo_primaryfirst
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f17896090610a32349f2c9b200d22b1eb75cfe0c;p=ceph.git

osd: get_primary_shard should not call pgtemp_undo_primaryfirst

In this variant of get_primary_shard, the function attempts to undo
the primaryfirst ordering.  This is incorrect, because pg_to_acting_osds
has already applied this.

The fix is simply to remove this code.

This is unlikely to be a significant problem, as this function is not
used in the critical locations.  We are building new test harnesses
which will rely on this behaviour.

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>
---

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index bbed6cf70ab..1de0a2dccd2 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -1355,7 +1355,7 @@ public:
     if (poolit->second.is_erasure()) {
       for (uint8_t i = 0; i < acting.size(); ++i) {
 	if (acting[i] == *primary) {
-	  *out = spg_t(pgid, pgtemp_undo_primaryfirst(poolit->second, pgid, shard_id_t(i)));
+	  *out = spg_t(pgid, shard_id_t(i));
 	  return true;
 	}
       }