ceph-17.2.7, Requires: fuse -> fuse3

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0003-src-common-bitstr.h.patch

@@ -8,14 +8,3 @@
  
  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);

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)
- 

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
-

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;
-   }

0017-gcc-12-omnibus.patch

@@ -50,11 +50,11 @@
    if (fs->mount() < 0) {
      cout << "mount failed" << std::endl;
      return -1;
---- ceph-16.2.7/src/s3select/include/s3select_functions.h.orig	2022-01-19 15:06:45.312783565 -0500
-+++ ceph-16.2.7/src/s3select/include/s3select_functions.h	2022-01-19 15:08:17.270087590 -0500
-@@ -142,7 +142,7 @@
+--- ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h.orig	2022-02-11 17:21:40.268627997 -0500
++++ ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h	2022-02-11 17:21:57.155325437 -0500
+@@ -466,7 +466,7 @@
  
-   virtual std::string  print(int ident)
+   std::string  print(int ident) override
    {
 -    return std::string(0);
 +    return std::string("");

0018-src-rgw-store-dbstore-CMakeLists.txt.patch

@@ -0,0 +1,37 @@
+--- ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt.orig	2022-03-01 08:19:04.974902872 -0500
++++ ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt	2022-03-11 07:55:16.236261471 -0500
+@@ -12,5 +12,5 @@
+ set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}")
+ 
+-add_library(sqlite_db ${sqlite_db_srcs})
++add_library(sqlite_db STATIC ${sqlite_db_srcs})
+ target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common)
+--- ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt.orig	2022-02-28 14:11:49.987077811 -0500
++++ ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt	2022-03-11 08:40:13.409682698 -0500
+@@ -16,7 +16,7 @@
+     dbstore_mgr.cc
+     )
+ 
+-add_library(dbstore_lib ${dbstore_srcs})
++add_library(dbstore_lib STATIC ${dbstore_srcs})
+ target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/fmt/include")
+ target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw")
+ set(link_targets spawn)
+@@ -38,6 +38,7 @@
+ 
+ # add pthread library
+ set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} pthread)
++set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} global)
+ 
+ find_package(gtest QUIET)
+ if(WITH_TESTS)
+@@ -47,7 +48,7 @@
+ endif()
+ 
+ include_directories(${CMAKE_INCLUDE_DIR})
+-add_library(dbstore ${dbstore_mgr_srcs})
++add_library(dbstore STATIC ${dbstore_mgr_srcs})
+ target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES})
+ 
+ # testing purpose

0018-src-test-CmakeLists.txt.patch

@@ -1,12 +0,0 @@
---- ceph-16.2.11/src/test/CMakeLists.txt.orig	2023-01-27 09:08:53.899536043 -0500
-+++ ceph-16.2.11/src/test/CMakeLists.txt	2023-01-27 09:09:28.245931182 -0500
-@@ -83,6 +83,9 @@
-   if(WITH_RADOSGW_KAFKA_ENDPOINT)
-     list(APPEND rgw_libs kafka_stub)
-   endif()
-+  if(WITH_RADOSGW_LUA_PACKAGES)
-+    list(APPEND rgw_libs Boost::filesystem)
-+  endif()
-   add_subdirectory(rgw)
- endif(WITH_RADOSGW)
- if(WITH_RBD AND NOT WIN32)

0019-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,10 +1,43 @@
 --- ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake.orig	2022-06-03 08:45:32.341075140 -0400
 +++ ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake	2022-06-03 08:46:47.195775813 -0400
-@@ -21,6 +21,7 @@
+@@ -10,8 +10,9 @@
+     check_cxx_source_compiles("
+ #include <atomic>
+ #include <cstdint>
++#include <cstddef>
+ 
+-#if defined(__s390x__) || defined(__mips__)
++#if defined(__SIZEOF_INT128__)
+ // Boost needs 16-byte atomics for tagged pointers.
+ // These are implemented via inline instructions on the platform
+ // if 16-byte alignment can be proven, and are delegated to libatomic
+@@ -21,13 +22,27 @@
  // We specifically test access via an otherwise unknown pointer here
  // to ensure we get the most complex case.  If this access can be
  // done without libatomic, then all accesses can be done.
-+bool atomic16(std::atomic<unsigned __int128> *ptr) __attribute__ ((used));
- bool atomic16(std::atomic<unsigned __int128> *ptr)
+-bool atomic16(std::atomic<unsigned __int128> *ptr)
++struct tagged_ptr {
++  int* ptr;
++  std::size_t tag;
++};
++
++void atomic16(std::atomic<tagged_ptr> *ptr) __attribute__ ((used));
++void atomic16(std::atomic<tagged_ptr> *ptr)
  {
-   return *ptr != 0;
+-  return *ptr != 0;
++  tagged_ptr p{nullptr, 1};
++  ptr->store(p);
++  tagged_ptr f = ptr->load();
++  tagged_ptr new_tag{nullptr, 0};
++  ptr->compare_exchange_strong(f, new_tag);
+ }
+ #endif
+ 
+ int main() {
++#if defined(__SIZEOF_INT128__)
++  std::atomic<tagged_ptr> ptr;
++  atomic16(&ptr);
++#endif
+   std::atomic<uint8_t> w1;
+   std::atomic<uint16_t> w2;
+   std::atomic<uint32_t> w4;

0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch

@@ -0,0 +1,11 @@
+--- ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake.orig	2022-04-08 11:27:53.593570634 -0400
++++ ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake	2022-04-08 11:28:20.778087653 -0400
+@@ -1991,7 +1991,7 @@
+ 
+ if((NOT ARROW_SIMD_LEVEL STREQUAL "NONE") OR (NOT ARROW_RUNTIME_SIMD_LEVEL STREQUAL "NONE"
+                                              ))
+-  set(xsimd_SOURCE "BUNDLED")
++  set(xsimd_SOURCE "SYSTEM")
+   resolve_dependency(xsimd)
+   # TODO: Don't use global includes but rather target_include_directories
+   include_directories(SYSTEM ${XSIMD_INCLUDE_DIR})

0022-mon-Replace-deprecated-use-of-format_to.patch

@@ -0,0 +1,28 @@
+From fff72cd14c58d06774cbd0274e6144b42448af03 Mon Sep 17 00:00:00 2001
+From: "Adam C. Emerson" <aemerson@redhat.com>
+Date: Mon, 7 Mar 2022 18:54:30 -0500
+Subject: [PATCH] mon: Replace deprecated use of format_to
+
+The non-deprecated version takes an explicit OutputIterator.
+
+Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
+---
+ src/mon/LogMonitor.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
+index 9103ddf7c5b..c196e8429fb 100644
+--- a/src/mon/LogMonitor.cc
++++ b/src/mon/LogMonitor.cc
+@@ -411,7 +411,7 @@ void LogMonitor::log_external(const LogEntry& le)
+     }
+ 
+     if (fd >= 0) {
+-      fmt::format_to(file_log_buffer, "{}\n", le);
++      fmt::format_to(std::back_inserter(file_log_buffer), "{}\n", le);
+       int err = safe_write(fd, file_log_buffer.data(), file_log_buffer.size());
+       file_log_buffer.clear();
+       if (err < 0) {
+-- 
+2.36.1
+

0023-src-s3select-include-s3select_parquet_intrf.h.patch

@@ -0,0 +1,218 @@
+--- ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h.orig	2022-01-11 15:47:52.000000000 -0500
++++ ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h	2022-08-22 10:26:06.738082924 -0400
+@@ -26,6 +26,14 @@
+ #include "internal_file_decryptor.h"
+ #include "encryption_internal.h"
+ 
++#if ARROW_VERSION_MAJOR < 9                                                           
++#define _ARROW_FD fd_
++#define _ARROW_FD_TYPE int
++#else
++#define _ARROW_FD fd_.fd()
++#define _ARROW_FD_TYPE arrow::internal::FileDescriptor
++#endif
++
+ /******************************************/
+ /******************************************/
+ class optional_yield;
+@@ -164,7 +172,7 @@
+   std::mutex lock_;
+ 
+   // File descriptor
+-  int fd_;
++  _ARROW_FD_TYPE fd_;
+ 
+   FileMode::type mode_;
+ 
+@@ -202,7 +210,7 @@
+     mode_ = write_only ? FileMode::WRITE : FileMode::READWRITE;
+ 
+     if (!truncate) {
+-      ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(fd_));
++      ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(_ARROW_FD));
+     } else {
+       size_ = 0;
+     }
+@@ -222,7 +230,11 @@
+     RETURN_NOT_OK(SetFileName(fd));
+     is_open_ = true;
+     mode_ = FileMode::WRITE;
++    #if ARROW_VERSION_MAJOR < 9
+     fd_ = fd;
++    #else
++    fd_ = arrow::internal::FileDescriptor{fd};
++    #endif
+     return Status::OK();
+   }
+ 
+@@ -230,7 +242,7 @@
+     RETURN_NOT_OK(SetFileName(path));
+ 
+     ARROW_ASSIGN_OR_RAISE(fd_, ::arrow::internal::FileOpenReadable(file_name_));
+-    ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(fd_));
++    ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(_ARROW_FD));
+ 
+     is_open_ = true;
+     mode_ = FileMode::READ;
+@@ -242,7 +254,11 @@
+     RETURN_NOT_OK(SetFileName(fd));
+     is_open_ = true;
+     mode_ = FileMode::READ;
++    #if ARROW_VERSION_MAJOR < 9
+     fd_ = fd;
++    #else
++    fd_ = arrow::internal::FileDescriptor{fd};
++    #endif
+     return Status::OK();
+   }
+ 
+@@ -258,9 +274,13 @@
+       // Even if closing fails, the fd will likely be closed (perhaps it's
+       // already closed).
+       is_open_ = false;
++      #if ARROW_VERSION_MAJOR < 9
+       int fd = fd_;
+       fd_ = -1;
+       RETURN_NOT_OK(::arrow::internal::FileClose(fd));
++      #else
++      RETURN_NOT_OK(fd_.Close());
++      #endif
+     }
+     return Status::OK();
+   }
+@@ -268,7 +288,7 @@
+   Result<int64_t> Read(int64_t nbytes, void* out) override {
+     RETURN_NOT_OK(CheckClosed());
+     RETURN_NOT_OK(CheckPositioned());
+-    return ::arrow::internal::FileRead(fd_, reinterpret_cast<uint8_t*>(out), nbytes);
++    return ::arrow::internal::FileRead(_ARROW_FD, reinterpret_cast<uint8_t*>(out), nbytes);
+   }
+ 
+   Result<int64_t> ReadAt(int64_t position, int64_t nbytes, void* out) override {
+@@ -277,7 +297,7 @@
+     // ReadAt() leaves the file position undefined, so require that we seek
+     // before calling Read() or Write().
+     need_seeking_.store(true);
+-    return ::arrow::internal::FileReadAt(fd_, reinterpret_cast<uint8_t*>(out), position,
++    return ::arrow::internal::FileReadAt(_ARROW_FD, reinterpret_cast<uint8_t*>(out), position,
+                                          nbytes);
+   }
+ 
+@@ -286,7 +306,7 @@
+     if (pos < 0) {
+       return Status::Invalid("Invalid position");
+     }
+-    Status st = ::arrow::internal::FileSeek(fd_, pos);
++    Status st = ::arrow::internal::FileSeek(_ARROW_FD, pos);
+     if (st.ok()) {
+       need_seeking_.store(false);
+     }
+@@ -295,7 +315,7 @@
+ 
+   Result<int64_t> Tell() const override {
+     RETURN_NOT_OK(CheckClosed());
+-    return ::arrow::internal::FileTell(fd_);
++    return ::arrow::internal::FileTell(_ARROW_FD);
+   }
+ 
+   Status Write(const void* data, int64_t length) override {
+@@ -306,11 +326,11 @@
+     if (length < 0) {
+       return Status::IOError("Length must be non-negative");
+     }
+-    return ::arrow::internal::FileWrite(fd_, reinterpret_cast<const uint8_t*>(data),
++    return ::arrow::internal::FileWrite(_ARROW_FD, reinterpret_cast<const uint8_t*>(data),
+                                         length);
+   }
+ 
+-  int fd() const override { return fd_; }
++  int fd() const override { return _ARROW_FD; }
+ 
+   bool is_open() const override { return is_open_; }
+ 
+@@ -345,7 +365,7 @@
+   std::mutex lock_;
+ 
+   // File descriptor
+-  int fd_;
++  _ARROW_FD_TYPE fd_;
+ 
+   FileMode::type mode_;
+ 
+@@ -411,7 +431,11 @@
+       // already closed).
+       is_open_ = false;
+       //int fd = fd_;
++      #if ARROW_VERSION_MAJOR < 9
+       fd_ = -1;
++      #else
++      fd_.Close();
++      #endif
+       //RETURN_NOT_OK(::arrow::internal::FileClose(fd));
+     }
+     return Status::OK();
+@@ -421,7 +445,7 @@
+     NOT_IMPLEMENT;
+     RETURN_NOT_OK(CheckClosed());
+     RETURN_NOT_OK(CheckPositioned());
+-    return ::arrow::internal::FileRead(fd_, reinterpret_cast<uint8_t*>(out), nbytes);
++    return ::arrow::internal::FileRead(_ARROW_FD, reinterpret_cast<uint8_t*>(out), nbytes);
+   }
+ 
+   Result<int64_t> ReadAt(int64_t position, int64_t nbytes, void* out) {
+@@ -443,7 +467,7 @@
+     return Status::OK();
+   }
+ 
+-  int fd() const { return fd_; }
++  int fd() const { return _ARROW_FD; }
+ 
+   bool is_open() const { return is_open_; }
+ 
+@@ -467,7 +491,7 @@
+   std::mutex lock_;
+ 
+   // File descriptor
+-  int fd_;
++  _ARROW_FD_TYPE fd_;
+ 
+   FileMode::type mode_;
+ 
+@@ -609,7 +633,7 @@
+     for (const auto& range : ranges) {
+       RETURN_NOT_OK(internal::ValidateRange(range.offset, range.length));
+ #if defined(POSIX_FADV_WILLNEED)
+-      if (posix_fadvise(fd_, range.offset, range.length, POSIX_FADV_WILLNEED)) {
++      if (posix_fadvise(_ARROW_FD, range.offset, range.length, POSIX_FADV_WILLNEED)) {
+         return IOErrorFromErrno(errno, "posix_fadvise failed");
+       }
+ #elif defined(F_RDADVISE)  // macOS, BSD?
+@@ -617,7 +641,7 @@
+         off_t ra_offset;
+         int ra_count;
+       } radvisory{range.offset, static_cast<int>(range.length)};
+-      if (radvisory.ra_count > 0 && fcntl(fd_, F_RDADVISE, &radvisory) == -1) {
++      if (radvisory.ra_count > 0 && fcntl(_ARROW_FD, F_RDADVISE, &radvisory) == -1) {
+         return IOErrorFromErrno(errno, "fcntl(fd, F_RDADVISE, ...) failed");
+       }
+ #endif
+@@ -970,6 +994,9 @@
+       CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_,
+                         static_cast<int16_t>(i), meta_decryptor, data_decryptor);
+       return PageReader::Open(stream, col->num_values(), col->compression(),
++      #if ARROW_VERSION_MAJOR > 8
++                              false,
++      #endif
+                               properties_.memory_pool(), &ctx);
+     }
+ 
+@@ -985,6 +1012,9 @@
+     CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_,
+                       static_cast<int16_t>(i), meta_decryptor, data_decryptor);
+     return PageReader::Open(stream, col->num_values(), col->compression(),
++    #if ARROW_VERSION_MAJOR > 8
++                            false,
++    #endif
+                             properties_.memory_pool(), &ctx);
+   }
+ 

sources

@@ -1 +1 @@
-SHA512 (ceph-16.2.13.tar.gz) = 39ec2bed1de0276f08bf93241f9fb275893041fd5f20ade75e68728107011ae5d01aed532d5afd8805951d09061a5a3d96c4311701c8897a29668f77126c19ab
+SHA512 (ceph-17.2.7.tar.gz) = 9005de7661c6a9d1054f1388cff2f48eb1af93565ebf852669de546eed594ed6a2668944b25a64c406d00f88bd2f7a6eac2ae96b04789c03ea4d248d1a683e7b