mon: ceph pg repeer should propose a correctly sized pg temp.

Resolves: rhbz#2415796
Fixes: https://tracker.ceph.com/issues/73897
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>
(cherry picked from commit a3cc500a543d1c2fb9e1d55c144e0a041e3d1f80)
(cherry picked from commit d5d37bcf35617898c872aa041b217bc5d96d8a22)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b7698ef254021fd6bdb5ec68139d79a1fb9c62e0..a9dbdd62118642517fd7e5f38fe72d3f9e262f58 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -12575,6 +12575,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
        goto reply_no_propose;
       }
     }
+    // Optimized EC does not cope with pg temp with a mismatched size.
+    pending_inc.new_pg_temp[pgid].resize(osdmap.get_pg_size(pgid), CRUSH_ITEM_NONE);
     goto update;
   } else if (prefix == "osd pg-upmap" ||
              prefix == "osd rm-pg-upmap" ||