Merge pull request #39325 from ifed01/wip-ifed-add-rocksdb-annex

octopus: os/bluestore: introduce bluestore_rocksdb_options_annex config parame…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc PendingReleaseNotes
index 9715be569968d000ec450e60e0b26c5d217897df,0cd6c40da3f10fdc187aa861e05b11af9154d9c0..cf62599debc08f5ec2b3bf00264da438447d34a9
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -1,8 -1,15 +1,12 @@@
  15.2.9
 ------
 -* mgr-pg_autoscaler: Autoscaler will now start out by scaling each
 -  pool to have a full complements of pgs from the start and will only
 -  decrease it when other pools need more pgs due to increased usage.
 -  This improves out of the box performance of Ceph by allowing more PGs 
 -  to be created for a given pool.
 +------
 +* MGR: progress module can now be turned on/off, using the commands:
 +  ``ceph progress on`` and ``ceph progress off``.
  
+ * New bluestore_rocksdb_options_annex config parameter. Complements
+   bluestore_rocksdb_options and allows setting rocksdb options without repeating
+   the existing defaults.
+ 
  15.2.8
  ------
  * $pid expansion in config paths like `admin_socket` will now properly expand

diff --cc src/os/bluestore/BlueStore.cc
Simple merge