Merge remote-tracking branch 'origin/quincy-stable-8' into quincy-stable-7

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

changelog.Debian

@@ -1,3 +1,10 @@
+ceph (17.2.7-pve2) bookworm; urgency=medium
+
+  * ensure RocksDB sub-component is build in release mode to avoid performance
+    regressions
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 09 Jan 2024 17:11:23 +0100
+
 ceph (17.2.7-pve1~bpo11+1) bullseye; urgency=medium
 
   * Rebuild for Proxmox VE 7, based on Debian Bullseye

patches/0021-debian-rules-fix-buildtype.patch

@@ -0,0 +1,22 @@
+From 1f4b106d49fc916994d97e273599f75caa904c3b Mon Sep 17 00:00:00 2001
+From: Mark Nelson <mark.nelson@clyso.com>
+Date: Thu, 14 Dec 2023 05:19:46 +0000
+Subject: [PATCH] debian/rules: Fix build_type for massive performance gain
+
+Signed-off-by: Mark Nelson <mark.nelson@clyso.com>
+---
+ debian/rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/debian/rules b/debian/rules
+index ed7f4a255ed4b..b28abb7d62788 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -29,6 +29,7 @@ extraopts += -DWITH_PYTHON3=3
+ extraopts += -DWITH_CEPHFS_JAVA=ON
+ extraopts += -DWITH_CEPHFS_SHELL=ON
+ extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
++extraopts += -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ extraopts += -DWITH_GRAFANA=ON
+ ifeq ($(DEB_HOST_ARCH), amd64)
+   extraopts += -DWITH_RBD_RWL=ON

patches/0022-rocksb-inherit-parent-cmake-cxx-flags.patch

@@ -0,0 +1,47 @@
+From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Fri, 15 Dec 2023 19:01:46 +0800
+Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS
+
+CMake allows us to customize `CMAKE_CXX_FLAGS` by setting CXXFLAGS
+environmental variable. and Debian's debhelper also sets CXXFLAGS
+when it builds cmake projects for customizing the building flags.
+
+but we fail to populate this setting down when building external
+projects. this is important when it comes to the projects which
+is critical to the performance. RocksDB is one of them.
+
+in this change, we pass the `CMAKE_CXX_FLAGS` down in
+`BuildRocksDB.cmake` so that its `CMAKE_CXX_FLAGS` contains
+the same set of `CMAKE_CXX_FLAGS` used by its parent project.
+
+this should help with the performance in the bluestore, where
+RocksDB is used.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+ (cherry-picked from beb1a624921d7589db63dea066935b3aa9ce2698)
+---
+ cmake/modules/BuildRocksDB.cmake | 4 ++--
+ cmake/modules/BuildRocksDB.cmake | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
+index f9a28274c40..e0208f6545b 100644
+--- a/cmake/modules/BuildRocksDB.cmake
++++ b/cmake/modules/BuildRocksDB.cmake
+@@ -57,12 +57,13 @@ function(build_rocksdb)
+   endif()
+   include(CheckCXXCompilerFlag)
+   check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY)
++  set(rocksdb_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   if(HAS_WARNING_DEPRECATED_COPY)
+-    set(rocksdb_CXX_FLAGS -Wno-deprecated-copy)
++    string(APPEND rocksdb_CXX_FLAGS " -Wno-deprecated-copy")
+   endif()
+   check_cxx_compiler_flag("-Wno-pessimizing-move" HAS_WARNING_PESSIMIZING_MOVE)
+   if(HAS_WARNING_PESSIMIZING_MOVE)
+-    set(rocksdb_CXX_FLAGS "${rocksdb_CXX_FLAGS} -Wno-pessimizing-move")
++    string(APPEND rocksdb_CXX_FLAGS " -Wno-pessimizing-move")
+   endif()
+   if(rocksdb_CXX_FLAGS)
+     list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_FLAGS='${rocksdb_CXX_FLAGS}')

patches/series

@@ -12,3 +12,5 @@
 0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
 0016-d-rules-fix-no-restart-on-upgrade.patch
 0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
+0021-debian-rules-fix-buildtype.patch
+0022-rocksb-inherit-parent-cmake-cxx-flags.patch