Merge pull request #69267 from MattyWilliams22/ec-omaps-enabled

osd: Enable support for omaps in EC pools

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Alex Ainscow <aainscow@uk.ibm.com>
Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>

diff --cc doc/dev/osd_internals/erasure_coding/client_support.rst
index 5ce50348aecfd85e06907698590e490bf917c216,f899c98e51a0638ca28c0fa6f6a5c3d9e8428a3a..9908592dd65fa190044a7cdfddcc336266c8172f
--- 1/doc/dev/osd_internals/erasure_coding/client_support.rst
--- 2/doc/dev/osd_internals/erasure_coding/client_support.rst
+++ b/doc/dev/osd_internals/erasure_coding/client_support.rst
@@@ -906,9 -906,10 +906,10 @@@ Required Setting
  
  To enable the new features, the following OSDMap pool settings are required:
  
 -- ``allows_ec_overwrites = true`
 +- ``allows_ec_overwrites = true``
  - ``allows_ec_optimizations = true``
- - ``supports_omap = true``
  
  These settings can be configured per-pool. The cluster will enforce that all
- OSDs are at the Umbrella release before allowing omap support to be enabled.
+ OSDs are at the Umbrella release before allowing omap support to be enabled.
+ 
+ The `supports_omap` pool flag is automatically enabled in pools with EC optimizations enabled.

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/ECCommon.cc
Simple merge

diff --cc src/osd/ECTransaction.cc
Simple merge

diff --cc src/test/librados/test_cxx.cc
Simple merge