From: Ronen Friedman <rfriedma@redhat.com>
Date: Fri, 17 Jul 2026 13:48:06 +0000 (+0300)
Subject: Merge pull request #70153 from ronen-fr/wip-rf-78124ecN
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45cf397e7d88d1275358f76e8195e02914888e1f;p=ceph.git

Merge pull request #70153 from ronen-fr/wip-rf-78124ecN

mon: require EC optimizations for Crimson EC pools

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

45cf397e7d88d1275358f76e8195e02914888e1f
diff --cc src/mon/OSDMonitor.cc
index 5da90e12229,873d26a1f58..b6cf780ea73
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -8653,21 -8651,14 +8658,20 @@@ OSDMonitor::enable_pool_ec_optimization
        }
      }
      p.flags |= pg_pool_t::FLAG_EC_OPTIMIZATIONS;
 +
 +    // Automatically enable omap support in fast EC pools
 +    // Omap is not supported by EC pools in crimson
 +    if (!p.is_crimson() && osdmap.require_osd_release >= ceph_release_t::umbrella) {
 +      p.flags |= pg_pool_t::FLAG_OMAP;
 +    }
    } else {
      if ((p.flags & pg_pool_t::FLAG_EC_OPTIMIZATIONS) != 0) {
-       if (ss) {
-         *ss << "allow_ec_optimizations cannot be disabled once enabled";
-       }
-       return -EINVAL;
+       return tl::unexpected(ErrorNMessage{
+ 	  -EINVAL,
+ 	  "allow_ec_optimizations cannot be disabled once enabled"});
      }
    }
-   return 0;
+   return {};
  }
  
  void OSDMonitor::maybe_enable_pool_split_ops(pg_pool_t &p) {