New release (1:0.94.7-2)

- Workaround xfs.h check

0001-Disable-erasure_codelib-neon-build.patch

@@ -0,0 +1,29 @@
+From 8ac49f54ad774324c1de344cd18620df7fa52256 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 15 Apr 2015 14:06:24 +0200
+Subject: [PATCH] Disable erasure_codelib neon build
+
+---
+ src/erasure-code/jerasure/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
+index 9ca4fbb..147d57e 100644
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -75,9 +75,9 @@ if LINUX
+ libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+-if HAVE_NEON
+-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
+-endif
++#if HAVE_NEON
++#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
++#endif
+ 
+ libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+-- 
+2.5.5
+

0001-src-common-crc32c_intel_fast.patch

@@ -1,55 +0,0 @@
---- ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s.orig	2020-05-26 08:34:32.226201974 -0400
-+++ ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s	2020-05-26 17:19:32.497201974 -0400
-@@ -1,5 +1,5 @@
- ;
--; Copyright 2012-2013 Intel Corporation All Rights Reserved.
-+; Copyright 2012-2015 Intel Corporation All Rights Reserved.
- ; All rights reserved.
- ;
- ; http://opensource.org/licenses/BSD-3-Clause
-@@ -59,6 +59,19 @@
- 	xor     rbx, rbx                ;; rbx = crc1 = 0;
- 	xor     r10, r10                ;; r10 = crc2 = 0;
- 
-+	cmp	len, %%bSize*3*2
-+	jbe	%%non_prefetch
-+
-+ %assign i 0
-+ %rep %%bSize/8 - 1
-+	crc32   rax, bufptmp  ;; update crc0
-+	crc32   rbx, bufptmp  ;; update crc1
-+	crc32   r10, bufptmp  ;; update crc2
-+	%assign i (i+8)
-+ %endrep
-+	jmp %%next %+ %1
-+
-+%%non_prefetch:
-  %assign i 0
-  %rep %%bSize/8 - 1
- 	crc32   rax, bufptmp  ;; update crc0
-@@ -66,6 +79,8 @@
- 	crc32   r10, bufptmp  ;; update crc2
- 	%assign i (i+8)
-  %endrep
-+
-+%%next %+ %1:
- 	crc32   rax, bufptmp  ;; update crc0
- 	crc32   rbx, bufptmp  ;; update crc1
- ; SKIP  ;crc32  r10, bufptmp  ;; update crc2
-@@ -180,12 +195,15 @@
- %define crc_init_dw     r8d
- %endif
- 
--
-+	endbranch
- 	push    rdi
- 	push    rbx
- 
- 	mov     rax, crc_init           ;; rax = crc_init;
- 
-+	cmp	len, 8
-+	jb	less_than_8
-+
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- 

0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch

@@ -0,0 +1,37 @@
+From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
+From: Anthony Alba <ascanio.alba7@gmail.com>
+Date: Mon, 30 Nov 2015 16:44:31 +0800
+Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
+
+Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index e4cea7e..1f19ffa 100644
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -288,7 +288,7 @@ for name in $what; do
+ 	lockfile=""
+     fi
+ 
+-    get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
++    get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
+ 
+     case "$command" in
+ 	start)
+@@ -404,8 +404,8 @@ for name in $what; do
+ 		# these keys.  it's also true for legacy installs
+ 		# via mkcephfs, which is fine too; there is no harm
+ 		# in creating these keys.
+-		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
+-		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
++		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
++		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
+ 		    echo Starting ceph-create-keys on $host...
+ 		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
+ 		    do_cmd "$cmd2"
+-- 
+2.5.5
+

0002-src-common-CMakeLists.txt.patch

@@ -1,13 +0,0 @@
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 65ba10b0f1..eeedc29c37 100644
---- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
-     crc32c_aarch64.c)
- endif(HAVE_INTEL)
- 
--add_library(crc32 ${crc32_srcs})
-+add_library(crc32 STATIC ${crc32_srcs})
- if(HAVE_ARMV8_CRC)
-   set_target_properties(crc32 PROPERTIES
-     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")

0003-Apply-ceph-0.94.1-tcmalloc.patch.patch

@@ -0,0 +1,26 @@
+From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:47:20 +0200
+Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/rocksdb/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
+index 855c6a8..fe914aa 100644
+--- a/src/rocksdb/configure.ac
++++ b/src/rocksdb/configure.ac
+@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
+ AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
+ AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
+ AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
+-AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
++AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
+ 
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+-- 
+2.5.5
+

0003-src-common-bitstr.h.patch

@@ -1,21 +0,0 @@
---- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
-+++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
-@@ -17,6 +17,7 @@
- #include <cstdint>
- #include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;
---- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
-+++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
-@@ -16,6 +16,8 @@
- #define CEPH_GLOBAL_SIGNAL_HANDLER_H
-
- #include <signal.h>
-+#include <string>
-+
- #include "acconfig.h"
-
- typedef void (*signal_handler_t)(int);

0004-Apply-init-ceph.in-fedora.patch.patch

@@ -0,0 +1,32 @@
+From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:48:23 +0200
+Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index 1f19ffa..78eaf97 100644
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -1,11 +1,11 @@
+ #!/bin/sh
+ # Start/stop ceph daemons
+-# chkconfig: 2345 60 80
++# chkconfig: - 60 80
+ 
+ ### BEGIN INIT INFO
+ # Provides:          ceph
+-# Default-Start:     2 3 4 5
+-# Default-Stop:      0 1 6
++# Default-Start:
++# Default-Stop:
+ # Required-Start:    $remote_fs $named $network $time
+ # Required-Stop:     $remote_fs $named $network $time
+ # Short-Description: Start Ceph distributed file system daemons at boot time
+-- 
+2.5.5
+

0005-Workaround-xfs.h-check.patch

@@ -0,0 +1,36 @@
+From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 20:53:28 +0200
+Subject: [PATCH] Workaround xfs.h check
+
+The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
+
+http://www.spinics.net/lists/ceph-devel/msg29467.html
+
+This should not be too critical and the package should build just fine
+anyway. Commenting out the bits that check for xfs.h should help us,
+here.
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d1f98aa..e068fdb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
+   [with_libxfs=yes])
+ AS_IF([test "x$with_libxfs" != "xno"], [
+   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
+-  AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+-    [xfs/xfs.h not found (--without-libxfs to disable)]))
++  #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
++  #  [xfs/xfs.h not found (--without-libxfs to disable)]))
+   AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
+   AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
+     #include <xfs/xfs.h>
+-- 
+2.5.5
+

0006-src-blk-CMakeLists.txt.patch

@@ -1,11 +0,0 @@
---- ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt.orig	2021-02-01 08:16:26.719517641 -0500
-+++ ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt	2021-02-01 08:16:47.810092341 -0500
-@@ -25,7 +25,7 @@
-     zoned/HMSMRDevice.cc)
- endif()
- 
--add_library(blk ${libblk_srcs})
-+add_library(blk STATIC ${libblk_srcs})
- target_include_directories(blk PRIVATE "./")
- 
- if(HAVE_LIBAIO)

0007-src-test-neorados-CMakeLists.txt.patch

@@ -1,11 +0,0 @@
---- ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt.orig	2021-02-01 08:25:18.006965821 -0500
-+++ ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt	2021-02-01 08:25:34.244407147 -0500
-@@ -19,7 +19,7 @@
- target_link_libraries(ceph_test_neorados_op_speed
-   libneorados fmt::fmt ${unittest_libs})
- 
--add_library(neoradostest-support common_tests.cc)
-+add_library(neoradostest-support STATIC common_tests.cc)
- target_link_libraries(neoradostest-support
-   libneorados fmt::fmt)
- 

0008-cmake-modules-Finduring.cmake.patch

@@ -1,11 +0,0 @@
---- ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake.orig	2021-02-01 08:45:39.316108287 -0500
-+++ ceph-16.1.0-43-g6b74fb5c/cmake/modules/Finduring.cmake	2021-02-01 08:45:59.813665378 -0500
-@@ -5,7 +5,7 @@
- # uring_FOUND - True if uring found.
- 
- find_path(URING_INCLUDE_DIR liburing.h)
--find_library(URING_LIBRARIES liburing.a liburing)
-+find_library(URING_LIBRARIES liburing.so liburing)
- 
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR)

0009-librgw-notifications-initialize-kafka-and-amqp.patch

@@ -1,63 +0,0 @@
-From 178f6bdac97b57300bbe0956633cf686a7e3ccee Mon Sep 17 00:00:00 2001
-From: Yuval Lifshitz <ylifshit@redhat.com>
-Date: Fri, 12 Mar 2021 08:56:45 +0200
-Subject: [PATCH] librgw/notifications: initialize kafka and amqp
-
-Fixes: https://tracker.ceph.com/issues/49738
-
-Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
----
- src/rgw/librgw.cc | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
-index 012cc54c3b..a5351dbe7c 100644
---- a/src/rgw/librgw.cc
-+++ b/src/rgw/librgw.cc
-@@ -53,6 +53,12 @@
- #include "rgw_http_client.h"
- #include "rgw_http_client_curl.h"
- #include "rgw_perf_counters.h"
-+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
-+#include "rgw_amqp.h"
-+#endif
-+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
-+#include "rgw_kafka.h"
-+#endif
- 
- #include "services/svc_zone.h"
- 
-@@ -617,6 +623,17 @@ namespace rgw {
-       /* ignore error */
-     }
- 
-+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
-+    if (!rgw::amqp::init(cct.get())) {
-+      derr << "ERROR: failed to initialize AMQP manager" << dendl;
-+    }
-+#endif
-+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
-+    if (!rgw::kafka::init(cct.get())) {
-+      derr << "ERROR: failed to initialize Kafka manager" << dendl;
-+    }
-+#endif
-+
-     return 0;
-   } /* RGWLib::init() */
- 
-@@ -645,6 +662,12 @@ namespace rgw {
-     rgw_shutdown_resolver();
-     rgw_http_client_cleanup();
-     rgw::curl::cleanup_curl();
-+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
-+    rgw::amqp::shutdown();
-+#endif
-+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
-+    rgw::kafka::shutdown();
-+#endif
- 
-     rgw_perf_stop(g_ceph_context);
- 
--- 
-2.26.2
-

0011-src-test-rgw-amqp_mock.cc.patch

@@ -1,23 +0,0 @@
---- a/src/test/rgw/amqp_mock.cc
-+++ b/src/test/rgw/amqp_mock.cc
-@@ -291,7 +291,11 @@ amqp_confirm_select_ok_t* amqp_confirm_select(amqp_connection_state_t state, amq
-   return state->confirm;
- }
- 
--int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *decoded_frame, struct timeval* tv) {
-+extern "C" {
-+
-+int amqp_simple_wait_frame_noblock(amqp_connection_state_t state,
-+                                   amqp_frame_t *decoded_frame,
-+                                   const struct timeval* tv) {
-   if (state->socket && state->socket->open_called &&
-       state->login_called && state->channel1 && state->channel2 && state->exchange &&
-       state->queue && state->consume && state->confirm && !FAIL_NEXT_READ) {
-@@ -345,6 +349,7 @@ int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *
-   }
-   return AMQP_STATUS_CONNECTION_CLOSED;
- }
-+} // extern "C"
- 
- amqp_basic_consume_ok_t* amqp_basic_consume(
-     amqp_connection_state_t state, amqp_channel_t channel, amqp_bytes_t queue,

0013-src-common-Formatter.cc.patch

@@ -1,10 +0,0 @@
---- ceph-16.2.4/src/common/Formatter.cc.orig	2021-07-07 09:32:25.513818420 -0400
-+++ ceph-16.2.4/src/common/Formatter.cc	2021-07-07 09:44:42.007373294 -0400
-@@ -21,6 +21,7 @@
- #include <fmt/format.h>
- #include <set>
- #include <limits>
-+#include <algorithm>
- 
- // -----------------------
- namespace ceph {

0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch

@@ -1,13 +0,0 @@
-diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
-index 257daa9c1fe..90e64f98a25 100644
---- a/src/rgw/rgw_string.h
-+++ b/src/rgw/rgw_string.h
-@@ -8,6 +8,8 @@
- #include <stdlib.h>
- #include <limits.h>
- #include <string_view>
-+#include <string>
-+#include <stdexcept>
- 
- #include <boost/container/small_vector.hpp>
- 

0015-src-kv-rocksdb_cache.patch

@@ -1,296 +0,0 @@
-diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
-index 0d657883e92de..47c56e2ddd769 100644
---- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
-+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
-@@ -151,13 +151,20 @@ void BinnedLRUCacheShard::EraseUnRefEntries() {
-   }
- }
- 
--void BinnedLRUCacheShard::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
--                                           bool thread_safe) {
-+void BinnedLRUCacheShard::ApplyToAllCacheEntries(
-+  const std::function<void(const rocksdb::Slice& key,
-+                           void* value,
-+                           size_t charge,
-+                           DeleterFn)>& callback,
-+  bool thread_safe)
-+{
-   if (thread_safe) {
-     mutex_.lock();
-   }
-   table_.ApplyToAllCacheEntries(
--      [callback](BinnedLRUHandle* h) { callback(h->value, h->charge); });
-+    [callback](BinnedLRUHandle* h) {
-+      callback(h->key(), h->value, h->charge, h->deleter);
-+    });
-   if (thread_safe) {
-     mutex_.unlock();
-   }
-@@ -345,7 +352,7 @@ bool BinnedLRUCacheShard::Release(rocksdb::Cache::Handle* handle, bool force_era
- 
- rocksdb::Status BinnedLRUCacheShard::Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
-                              size_t charge,
--                             void (*deleter)(const rocksdb::Slice& key, void* value),
-+                             DeleterFn deleter,
-                              rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) {
-   auto e = new BinnedLRUHandle();
-   rocksdb::Status s;
-@@ -464,6 +471,12 @@ std::string BinnedLRUCacheShard::GetPrintableOptions() const {
-   return std::string(buffer);
- }
- 
-+DeleterFn BinnedLRUCacheShard::GetDeleter(rocksdb::Cache::Handle* h) const
-+{
-+  auto* handle = reinterpret_cast<BinnedLRUHandle*>(h);
-+  return handle->deleter;
-+}
-+
- BinnedLRUCache::BinnedLRUCache(CephContext *c, 
-                                size_t capacity, 
-                                int num_shard_bits,
-@@ -519,6 +532,13 @@ void BinnedLRUCache::DisownData() {
- #endif  // !__SANITIZE_ADDRESS__
- }
- 
-+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
-+DeleterFn BinnedLRUCache::GetDeleter(Handle* handle) const
-+{
-+  return reinterpret_cast<const BinnedLRUHandle*>(handle)->deleter;
-+}
-+#endif
-+
- size_t BinnedLRUCache::TEST_GetLRUSize() {
-   size_t lru_size_of_all_shards = 0;
-   for (int i = 0; i < num_shards_; i++) {
-diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
-index 85608be0e5734..88bf4502e8927 100644
---- a/src/kv/rocksdb_cache/BinnedLRUCache.h
-+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
-@@ -56,7 +56,7 @@ std::shared_ptr<rocksdb::Cache> NewBinnedLRUCache(
- 
- struct BinnedLRUHandle {
-   void* value;
--  void (*deleter)(const rocksdb::Slice&, void* value);
-+  DeleterFn deleter;
-   BinnedLRUHandle* next_hash;
-   BinnedLRUHandle* next;
-   BinnedLRUHandle* prev;
-@@ -189,7 +189,7 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
-   // Like Cache methods, but with an extra "hash" parameter.
-   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
-                         size_t charge,
--                        void (*deleter)(const rocksdb::Slice& key, void* value),
-+                        DeleterFn deleter,
-                         rocksdb::Cache::Handle** handle,
-                         rocksdb::Cache::Priority priority) override;
-   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) override;
-@@ -205,13 +205,19 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
-   virtual size_t GetUsage() const override;
-   virtual size_t GetPinnedUsage() const override;
- 
--  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
--                                      bool thread_safe) override;
-+  virtual void ApplyToAllCacheEntries(
-+    const std::function<void(const rocksdb::Slice& key,
-+                             void* value,
-+                             size_t charge,
-+                             DeleterFn)>& callback,
-+    bool thread_safe) override;
- 
-   virtual void EraseUnRefEntries() override;
- 
-   virtual std::string GetPrintableOptions() const override;
- 
-+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const override;
-+
-   void TEST_GetLRUList(BinnedLRUHandle** lru, BinnedLRUHandle** lru_low_pri);
- 
-   //  Retrieves number of elements in LRU, for unit test purpose only
-@@ -304,7 +310,9 @@ class BinnedLRUCache : public ShardedCache {
-   virtual size_t GetCharge(Handle* handle) const override;
-   virtual uint32_t GetHash(Handle* handle) const override;
-   virtual void DisownData() override;
--
-+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
-+  virtual DeleterFn GetDeleter(Handle* handle) const override;
-+#endif
-   //  Retrieves number of elements in LRU, for unit test purpose only
-   size_t TEST_GetLRUSize();
-   // Sets the high pri pool ratio
-diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
-index 367140a94d8be..6cbd89ad6472c 100644
---- a/src/kv/rocksdb_cache/ShardedCache.cc
-+++ b/src/kv/rocksdb_cache/ShardedCache.cc
-@@ -44,7 +44,7 @@ void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) {
- }
- 
- rocksdb::Status ShardedCache::Insert(const rocksdb::Slice& key, void* value, size_t charge,
--                            void (*deleter)(const rocksdb::Slice& key, void* value),
-+                            DeleterFn deleter,
-                             rocksdb::Cache::Handle** handle, Priority priority) {
-   uint32_t hash = HashSlice(key);
-   return GetShard(Shard(hash))
-@@ -109,13 +109,36 @@ size_t ShardedCache::GetPinnedUsage() const {
-   return usage;
- }
- 
-+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
-+DeleterFn ShardedCache::GetDeleter(Handle* handle) const
-+{
-+  uint32_t hash = GetHash(handle);
-+  return GetShard(Shard(hash))->GetDeleter(handle);
-+}
-+
-+void ShardedCache::ApplyToAllEntries(
-+    const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
-+                             DeleterFn deleter)>& callback,
-+    const ApplyToAllEntriesOptions& opts)
-+{
-+  int num_shards = 1 << num_shard_bits_;
-+  for (int s = 0; s < num_shards; s++) {
-+    GetShard(s)->ApplyToAllCacheEntries(callback, true /* thread_safe */);
-+  }
-+}
-+#else
- void ShardedCache::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
-                                           bool thread_safe) {
-   int num_shards = 1 << num_shard_bits_;
-   for (int s = 0; s < num_shards; s++) {
--    GetShard(s)->ApplyToAllCacheEntries(callback, thread_safe);
-+    GetShard(s)->ApplyToAllCacheEntries(
-+      [callback](const rocksdb::Slice&, void* value, size_t charge, DeleterFn) {
-+        callback(value, charge);
-+      },
-+      thread_safe);
-   }
- }
-+#endif
- 
- void ShardedCache::EraseUnRefEntries() {
-   int num_shards = 1 << num_shard_bits_;
-@@ -131,7 +154,7 @@ std::string ShardedCache::GetPrintableOptions() const {
-   char buffer[kBufferSize];
-   {
-     std::lock_guard<std::mutex> l(capacity_mutex_);
--    snprintf(buffer, kBufferSize, "    capacity : %" ROCKSDB_PRIszt "\n",
-+    snprintf(buffer, kBufferSize, "    capacity : %zu\n",
-              capacity_);
-     ret.append(buffer);
-     snprintf(buffer, kBufferSize, "    num_shard_bits : %d\n", num_shard_bits_);
-diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
-index 4d64893ab1c7b..f98421a09a33a 100644
---- a/src/kv/rocksdb_cache/ShardedCache.h
-+++ b/src/kv/rocksdb_cache/ShardedCache.h
-@@ -14,6 +14,7 @@
- #include <string>
- #include <mutex>
- 
-+#include "rocksdb/version.h"
- #include "rocksdb/cache.h"
- #include "include/ceph_hash.h"
- #include "common/PriorityCache.h"
-@@ -22,10 +23,11 @@
- #ifndef CACHE_LINE_SIZE
- #define CACHE_LINE_SIZE 64 // XXX arch-specific define 
- #endif
--#define ROCKSDB_PRIszt "zu"
- 
- namespace rocksdb_cache {
- 
-+using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
-+
- // Single cache shard interface.
- class CacheShard {
-  public:
-@@ -34,7 +36,7 @@ class CacheShard {
- 
-   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
-                                  size_t charge,
--                                 void (*deleter)(const rocksdb::Slice& key, void* value),
-+                                 DeleterFn deleter,
-                                  rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) = 0;
-   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) = 0;
-   virtual bool Ref(rocksdb::Cache::Handle* handle) = 0;
-@@ -44,10 +46,15 @@ class CacheShard {
-   virtual void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
-   virtual size_t GetUsage() const = 0;
-   virtual size_t GetPinnedUsage() const = 0;
--  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
--                                      bool thread_safe) = 0;
-+  virtual void ApplyToAllCacheEntries(
-+    const std::function<void(const rocksdb::Slice& key,
-+                             void* value,
-+                             size_t charge,
-+                             DeleterFn)>& callback,
-+    bool thread_safe) = 0;
-   virtual void EraseUnRefEntries() = 0;
-   virtual std::string GetPrintableOptions() const { return ""; }
-+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const = 0;
- };
- 
- // Generic cache interface which shards cache by hash of keys. 2^num_shard_bits
-@@ -57,34 +64,43 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
-  public:
-   ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit);
-   virtual ~ShardedCache() = default;
-+  // rocksdb::Cache
-   virtual const char* Name() const override = 0;
--  virtual CacheShard* GetShard(int shard) = 0;
--  virtual const CacheShard* GetShard(int shard) const = 0;
--  virtual void* Value(Handle* handle) override = 0;
--  virtual size_t GetCharge(Handle* handle) const = 0;
--  virtual uint32_t GetHash(Handle* handle) const = 0;
--  virtual void DisownData() override = 0;
--
--  virtual void SetCapacity(size_t capacity) override;
--  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
--
-   virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
--                                 void (*deleter)(const rocksdb::Slice& key, void* value),
-+                                 DeleterFn,
-                                  rocksdb::Cache::Handle** handle, Priority priority) override;
-   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
-   virtual bool Ref(rocksdb::Cache::Handle* handle) override;
-   virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) override;
-+  virtual void* Value(Handle* handle) override = 0;
-   virtual void Erase(const rocksdb::Slice& key) override;
-   virtual uint64_t NewId() override;
--  virtual size_t GetCapacity() const override;
-+  virtual void SetCapacity(size_t capacity) override;
-+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
-   virtual bool HasStrictCapacityLimit() const override;
-+  virtual size_t GetCapacity() const override;
-   virtual size_t GetUsage() const override;
-   virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
-   virtual size_t GetPinnedUsage() const override;
-+  virtual size_t GetCharge(Handle* handle) const = 0;
-+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
-+  virtual DeleterFn GetDeleter(Handle* handle) const override;
-+#endif
-+  virtual void DisownData() override = 0;
-+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
-+  virtual void ApplyToAllEntries(
-+      const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
-+                               DeleterFn deleter)>& callback,
-+      const ApplyToAllEntriesOptions& opts) override;
-+#else
-   virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
-                                       bool thread_safe) override;
-+#endif
-   virtual void EraseUnRefEntries() override;
-   virtual std::string GetPrintableOptions() const override;
-+  virtual CacheShard* GetShard(int shard) = 0;
-+  virtual const CacheShard* GetShard(int shard) const = 0;
-+  virtual uint32_t GetHash(Handle* handle) const = 0;
- 
-   int GetNumShardBits() const { return num_shard_bits_; }
- 
-@@ -120,7 +136,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
- //    return Hash(s.data(), s.size(), 0);
-   }
- 
--  uint32_t Shard(uint32_t hash) {
-+  uint32_t Shard(uint32_t hash) const {
-     // Note, hash >> 32 yields hash in gcc, not the zero we expect!
-     return (num_shard_bits_ > 0) ? (hash >> (32 - num_shard_bits_)) : 0;
-   }

cmake-modules-BuildBoost.cmake.noautopatch

@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index 2e92132366..3cb1e3d958 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -62,7 +62,7 @@ function(do_build_boost version)
-   else()
-     list(APPEND boost_features "address-model=32")
-   endif()
--  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
-+  set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX
-   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
- 
-   set(boost_with_libs)

sources

@@ -1 +1,3 @@
-SHA512 (ceph-16.2.9.tar.bz2) = 3edb7beac5ca203d9e4852b02548d71707530beebbae26c9012c352a430178b346abd54a8a50d4b24e1f2de4d0539db3fc9b43910564a20cf40de5feabc2e2e6
+e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
+566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
+a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz