summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch51
-rw-r--r--recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch70
-rw-r--r--recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch101
-rw-r--r--recipes-extended/ceph/ceph/0004-kv-rocksdb_cache-implement-methods-required-by-rocks.patch207
-rw-r--r--recipes-extended/ceph/ceph/0005-kv-rocksdb_cache-mark-Shard-const.patch32
-rw-r--r--recipes-extended/ceph/ceph/0006-rocksdb-build-with-rocksdb-7.y.z.patch109
-rw-r--r--recipes-extended/ceph/ceph_15.2.15.bb6
7 files changed, 576 insertions, 0 deletions
diff --git a/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch b/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch
new file mode 100644
index 00000000..795c60fc
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch
@@ -0,0 +1,51 @@
1From b7b58010fd10b95c681df78cc4322e6586a39099 Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 15:20:24 +0800
4Subject: [PATCH 1/6] kv/rocksdb_cache: drop ROCKSDB_PRIszt
5
6ROCKSDB_PRIszt is a macro for "zu", which is in turn use for printing an
7(unsigned) size_t variable.
8
9there is no point having it in the header file or define a macro for it,
10as %zu is standard compliant, and we don't get any advantage by using a
11macro for it.
12
13Signed-off-by: Kefu Chai <kchai@redhat.com>
14
15Upstream-Status: Backport [44f5b827eb3c65665373a86908bf5d47e7d02687]
16
17Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
18
19---
20 src/kv/rocksdb_cache/ShardedCache.cc | 2 +-
21 src/kv/rocksdb_cache/ShardedCache.h | 1 -
22 2 files changed, 1 insertion(+), 2 deletions(-)
23
24diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
25index 367140a9..8e08deb8 100644
26--- a/src/kv/rocksdb_cache/ShardedCache.cc
27+++ b/src/kv/rocksdb_cache/ShardedCache.cc
28@@ -131,7 +131,7 @@ std::string ShardedCache::GetPrintableOptions() const {
29 char buffer[kBufferSize];
30 {
31 std::lock_guard<std::mutex> l(capacity_mutex_);
32- snprintf(buffer, kBufferSize, " capacity : %" ROCKSDB_PRIszt "\n",
33+ snprintf(buffer, kBufferSize, " capacity : %zu\n",
34 capacity_);
35 ret.append(buffer);
36 snprintf(buffer, kBufferSize, " num_shard_bits : %d\n", num_shard_bits_);
37diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
38index 4d64893a..8ab2587b 100644
39--- a/src/kv/rocksdb_cache/ShardedCache.h
40+++ b/src/kv/rocksdb_cache/ShardedCache.h
41@@ -22,7 +22,6 @@
42 #ifndef CACHE_LINE_SIZE
43 #define CACHE_LINE_SIZE 64 // XXX arch-specific define
44 #endif
45-#define ROCKSDB_PRIszt "zu"
46
47 namespace rocksdb_cache {
48
49--
502.33.0
51
diff --git a/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch b/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch
new file mode 100644
index 00000000..3fc8c860
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch
@@ -0,0 +1,70 @@
1From 6cdb1387a713fad765b5193d5acf4504f206a66f Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 15:39:00 +0800
4Subject: [PATCH 2/6] kv/rocksdb_cache: reorder ShardedCache methods
5 declarations
6
7in the exact order in which rocksdb::Cache declare its public virtual
8methods.
9
10Signed-off-by: Kefu Chai <kchai@redhat.com>
11
12Upstream-Status: Backport [633656f8ade2c1d67a66f8b7ca3aa0a2ae82e6b1]
13
14Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
15---
16 src/kv/rocksdb_cache/ShardedCache.h | 21 ++++++++++-----------
17 1 file changed, 10 insertions(+), 11 deletions(-)
18
19diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
20index 8ab2587b..a16cf561 100644
21--- a/src/kv/rocksdb_cache/ShardedCache.h
22+++ b/src/kv/rocksdb_cache/ShardedCache.h
23@@ -56,34 +56,33 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
24 public:
25 ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit);
26 virtual ~ShardedCache() = default;
27+ // rocksdb::Cache
28 virtual const char* Name() const override = 0;
29- virtual CacheShard* GetShard(int shard) = 0;
30- virtual const CacheShard* GetShard(int shard) const = 0;
31- virtual void* Value(Handle* handle) override = 0;
32- virtual size_t GetCharge(Handle* handle) const = 0;
33- virtual uint32_t GetHash(Handle* handle) const = 0;
34- virtual void DisownData() override = 0;
35-
36- virtual void SetCapacity(size_t capacity) override;
37- virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
38-
39 virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
40 void (*deleter)(const rocksdb::Slice& key, void* value),
41 rocksdb::Cache::Handle** handle, Priority priority) override;
42 virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
43 virtual bool Ref(rocksdb::Cache::Handle* handle) override;
44 virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) override;
45+ virtual void* Value(Handle* handle) override = 0;
46 virtual void Erase(const rocksdb::Slice& key) override;
47 virtual uint64_t NewId() override;
48- virtual size_t GetCapacity() const override;
49+ virtual void SetCapacity(size_t capacity) override;
50+ virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
51 virtual bool HasStrictCapacityLimit() const override;
52+ virtual size_t GetCapacity() const override;
53 virtual size_t GetUsage() const override;
54 virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
55 virtual size_t GetPinnedUsage() const override;
56+ virtual size_t GetCharge(Handle* handle) const = 0;
57+ virtual void DisownData() override = 0;
58 virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
59 bool thread_safe) override;
60 virtual void EraseUnRefEntries() override;
61 virtual std::string GetPrintableOptions() const override;
62+ virtual CacheShard* GetShard(int shard) = 0;
63+ virtual const CacheShard* GetShard(int shard) const = 0;
64+ virtual uint32_t GetHash(Handle* handle) const = 0;
65
66 int GetNumShardBits() const { return num_shard_bits_; }
67
68--
692.33.0
70
diff --git a/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch b/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch
new file mode 100644
index 00000000..01144b79
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch
@@ -0,0 +1,101 @@
1From 29f1e556c1e7c5ab195983552387e1410e0b5b6c Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 16:25:32 +0800
4Subject: [PATCH 3/6] kv/rocksdb_cache: define DeleterFn function pointer type
5
6this paves the road to rocksdb v6.22.1 compatible implementation
7
8Signed-off-by: Kefu Chai <kchai@redhat.com>
9
10Upstream-Status: Backport [c7a6c74b62dfcc96f676eb6d8844852c4705b66f]
11
12Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
13---
14 src/kv/rocksdb_cache/BinnedLRUCache.cc | 2 +-
15 src/kv/rocksdb_cache/BinnedLRUCache.h | 4 ++--
16 src/kv/rocksdb_cache/ShardedCache.cc | 2 +-
17 src/kv/rocksdb_cache/ShardedCache.h | 6 ++++--
18 4 files changed, 8 insertions(+), 6 deletions(-)
19
20diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
21index 2391a7f6..4e5f4dd4 100644
22--- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
23+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
24@@ -344,7 +344,7 @@ bool BinnedLRUCacheShard::Release(rocksdb::Cache::Handle* handle, bool force_era
25
26 rocksdb::Status BinnedLRUCacheShard::Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
27 size_t charge,
28- void (*deleter)(const rocksdb::Slice& key, void* value),
29+ DeleterFn deleter,
30 rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) {
31 auto e = new BinnedLRUHandle();
32 rocksdb::Status s;
33diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
34index 96023ce2..b0fb7148 100644
35--- a/src/kv/rocksdb_cache/BinnedLRUCache.h
36+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
37@@ -56,7 +56,7 @@ std::shared_ptr<rocksdb::Cache> NewBinnedLRUCache(
38
39 struct BinnedLRUHandle {
40 void* value;
41- void (*deleter)(const rocksdb::Slice&, void* value);
42+ DeleterFn deleter;
43 BinnedLRUHandle* next_hash;
44 BinnedLRUHandle* next;
45 BinnedLRUHandle* prev;
46@@ -189,7 +189,7 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
47 // Like Cache methods, but with an extra "hash" parameter.
48 virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
49 size_t charge,
50- void (*deleter)(const rocksdb::Slice& key, void* value),
51+ DeleterFn deleter,
52 rocksdb::Cache::Handle** handle,
53 rocksdb::Cache::Priority priority) override;
54 virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) override;
55diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
56index 8e08deb8..ef3b3b98 100644
57--- a/src/kv/rocksdb_cache/ShardedCache.cc
58+++ b/src/kv/rocksdb_cache/ShardedCache.cc
59@@ -44,7 +44,7 @@ void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) {
60 }
61
62 rocksdb::Status ShardedCache::Insert(const rocksdb::Slice& key, void* value, size_t charge,
63- void (*deleter)(const rocksdb::Slice& key, void* value),
64+ DeleterFn deleter,
65 rocksdb::Cache::Handle** handle, Priority priority) {
66 uint32_t hash = HashSlice(key);
67 return GetShard(Shard(hash))
68diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
69index a16cf561..674e5322 100644
70--- a/src/kv/rocksdb_cache/ShardedCache.h
71+++ b/src/kv/rocksdb_cache/ShardedCache.h
72@@ -25,6 +25,8 @@
73
74 namespace rocksdb_cache {
75
76+using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
77+
78 // Single cache shard interface.
79 class CacheShard {
80 public:
81@@ -33,7 +35,7 @@ class CacheShard {
82
83 virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
84 size_t charge,
85- void (*deleter)(const rocksdb::Slice& key, void* value),
86+ DeleterFn deleter,
87 rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) = 0;
88 virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) = 0;
89 virtual bool Ref(rocksdb::Cache::Handle* handle) = 0;
90@@ -59,7 +61,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
91 // rocksdb::Cache
92 virtual const char* Name() const override = 0;
93 virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
94- void (*deleter)(const rocksdb::Slice& key, void* value),
95+ DeleterFn,
96 rocksdb::Cache::Handle** handle, Priority priority) override;
97 virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
98 virtual bool Ref(rocksdb::Cache::Handle* handle) override;
99--
1002.33.0
101
diff --git a/recipes-extended/ceph/ceph/0004-kv-rocksdb_cache-implement-methods-required-by-rocks.patch b/recipes-extended/ceph/ceph/0004-kv-rocksdb_cache-implement-methods-required-by-rocks.patch
new file mode 100644
index 00000000..ee1e1416
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0004-kv-rocksdb_cache-implement-methods-required-by-rocks.patch
@@ -0,0 +1,207 @@
1From 90696cb3652eb307c6aadde4af7d9198dc00c15f Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 16:27:47 +0800
4Subject: [PATCH 4/6] kv/rocksdb_cache: implement methods required by rocksdb
5 v6.22.1
6
7rocksdb v6.22.1 added couple pure methods, so let's implement them.
8
9Signed-off-by: Kefu Chai <kchai@redhat.com>
10
11Upstream-Status: Backport [2c445598ce5280e85feb1f0e94d1940a444ee421]
12
13Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
14---
15 src/kv/rocksdb_cache/BinnedLRUCache.cc | 26 +++++++++++++++++++++++---
16 src/kv/rocksdb_cache/BinnedLRUCache.h | 14 +++++++++++---
17 src/kv/rocksdb_cache/ShardedCache.cc | 25 ++++++++++++++++++++++++-
18 src/kv/rocksdb_cache/ShardedCache.h | 20 ++++++++++++++++++--
19 4 files changed, 76 insertions(+), 9 deletions(-)
20
21diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
22index 4e5f4dd4..1e6ba7af 100644
23--- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
24+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
25@@ -150,13 +150,20 @@ void BinnedLRUCacheShard::EraseUnRefEntries() {
26 }
27 }
28
29-void BinnedLRUCacheShard::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
30- bool thread_safe) {
31+void BinnedLRUCacheShard::ApplyToAllCacheEntries(
32+ const std::function<void(const rocksdb::Slice& key,
33+ void* value,
34+ size_t charge,
35+ DeleterFn)>& callback,
36+ bool thread_safe)
37+{
38 if (thread_safe) {
39 mutex_.lock();
40 }
41 table_.ApplyToAllCacheEntries(
42- [callback](BinnedLRUHandle* h) { callback(h->value, h->charge); });
43+ [callback](BinnedLRUHandle* h) {
44+ callback(h->key(), h->value, h->charge, h->deleter);
45+ });
46 if (thread_safe) {
47 mutex_.unlock();
48 }
49@@ -463,6 +470,12 @@ std::string BinnedLRUCacheShard::GetPrintableOptions() const {
50 return std::string(buffer);
51 }
52
53+DeleterFn BinnedLRUCacheShard::GetDeleter(rocksdb::Cache::Handle* h) const
54+{
55+ auto* handle = reinterpret_cast<BinnedLRUHandle*>(h);
56+ return handle->deleter;
57+}
58+
59 BinnedLRUCache::BinnedLRUCache(CephContext *c,
60 size_t capacity,
61 int num_shard_bits,
62@@ -518,6 +531,13 @@ void BinnedLRUCache::DisownData() {
63 #endif // !__SANITIZE_ADDRESS__
64 }
65
66+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
67+DeleterFn BinnedLRUCache::GetDeleter(Handle* handle) const
68+{
69+ return reinterpret_cast<const BinnedLRUHandle*>(handle)->deleter;
70+}
71+#endif
72+
73 size_t BinnedLRUCache::TEST_GetLRUSize() {
74 size_t lru_size_of_all_shards = 0;
75 for (int i = 0; i < num_shards_; i++) {
76diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
77index b0fb7148..ba0c2720 100644
78--- a/src/kv/rocksdb_cache/BinnedLRUCache.h
79+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
80@@ -205,13 +205,19 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
81 virtual size_t GetUsage() const override;
82 virtual size_t GetPinnedUsage() const override;
83
84- virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
85- bool thread_safe) override;
86+ virtual void ApplyToAllCacheEntries(
87+ const std::function<void(const rocksdb::Slice& key,
88+ void* value,
89+ size_t charge,
90+ DeleterFn)>& callback,
91+ bool thread_safe) override;
92
93 virtual void EraseUnRefEntries() override;
94
95 virtual std::string GetPrintableOptions() const override;
96
97+ virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const override;
98+
99 void TEST_GetLRUList(BinnedLRUHandle** lru, BinnedLRUHandle** lru_low_pri);
100
101 // Retrieves number of elements in LRU, for unit test purpose only
102@@ -303,7 +309,9 @@ class BinnedLRUCache : public ShardedCache {
103 virtual size_t GetCharge(Handle* handle) const override;
104 virtual uint32_t GetHash(Handle* handle) const override;
105 virtual void DisownData() override;
106-
107+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
108+ virtual DeleterFn GetDeleter(Handle* handle) const override;
109+#endif
110 // Retrieves number of elements in LRU, for unit test purpose only
111 size_t TEST_GetLRUSize();
112 // Sets the high pri pool ratio
113diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
114index ef3b3b98..6cbd89ad 100644
115--- a/src/kv/rocksdb_cache/ShardedCache.cc
116+++ b/src/kv/rocksdb_cache/ShardedCache.cc
117@@ -109,13 +109,36 @@ size_t ShardedCache::GetPinnedUsage() const {
118 return usage;
119 }
120
121+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
122+DeleterFn ShardedCache::GetDeleter(Handle* handle) const
123+{
124+ uint32_t hash = GetHash(handle);
125+ return GetShard(Shard(hash))->GetDeleter(handle);
126+}
127+
128+void ShardedCache::ApplyToAllEntries(
129+ const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
130+ DeleterFn deleter)>& callback,
131+ const ApplyToAllEntriesOptions& opts)
132+{
133+ int num_shards = 1 << num_shard_bits_;
134+ for (int s = 0; s < num_shards; s++) {
135+ GetShard(s)->ApplyToAllCacheEntries(callback, true /* thread_safe */);
136+ }
137+}
138+#else
139 void ShardedCache::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
140 bool thread_safe) {
141 int num_shards = 1 << num_shard_bits_;
142 for (int s = 0; s < num_shards; s++) {
143- GetShard(s)->ApplyToAllCacheEntries(callback, thread_safe);
144+ GetShard(s)->ApplyToAllCacheEntries(
145+ [callback](const rocksdb::Slice&, void* value, size_t charge, DeleterFn) {
146+ callback(value, charge);
147+ },
148+ thread_safe);
149 }
150 }
151+#endif
152
153 void ShardedCache::EraseUnRefEntries() {
154 int num_shards = 1 << num_shard_bits_;
155diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
156index 674e5322..4d3ca302 100644
157--- a/src/kv/rocksdb_cache/ShardedCache.h
158+++ b/src/kv/rocksdb_cache/ShardedCache.h
159@@ -14,6 +14,7 @@
160 #include <string>
161 #include <mutex>
162
163+#include "rocksdb/version.h"
164 #include "rocksdb/cache.h"
165 #include "include/ceph_hash.h"
166 #include "common/PriorityCache.h"
167@@ -45,10 +46,15 @@ class CacheShard {
168 virtual void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
169 virtual size_t GetUsage() const = 0;
170 virtual size_t GetPinnedUsage() const = 0;
171- virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
172- bool thread_safe) = 0;
173+ virtual void ApplyToAllCacheEntries(
174+ const std::function<void(const rocksdb::Slice& key,
175+ void* value,
176+ size_t charge,
177+ DeleterFn)>& callback,
178+ bool thread_safe) = 0;
179 virtual void EraseUnRefEntries() = 0;
180 virtual std::string GetPrintableOptions() const { return ""; }
181+ virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const = 0;
182 };
183
184 // Generic cache interface which shards cache by hash of keys. 2^num_shard_bits
185@@ -77,9 +83,19 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
186 virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
187 virtual size_t GetPinnedUsage() const override;
188 virtual size_t GetCharge(Handle* handle) const = 0;
189+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
190+ virtual DeleterFn GetDeleter(Handle* handle) const override;
191+#endif
192 virtual void DisownData() override = 0;
193+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
194+ virtual void ApplyToAllEntries(
195+ const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
196+ DeleterFn deleter)>& callback,
197+ const ApplyToAllEntriesOptions& opts) override;
198+#else
199 virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
200 bool thread_safe) override;
201+#endif
202 virtual void EraseUnRefEntries() override;
203 virtual std::string GetPrintableOptions() const override;
204 virtual CacheShard* GetShard(int shard) = 0;
205--
2062.33.0
207
diff --git a/recipes-extended/ceph/ceph/0005-kv-rocksdb_cache-mark-Shard-const.patch b/recipes-extended/ceph/ceph/0005-kv-rocksdb_cache-mark-Shard-const.patch
new file mode 100644
index 00000000..bc18574c
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0005-kv-rocksdb_cache-mark-Shard-const.patch
@@ -0,0 +1,32 @@
1From 52c57e25a5e2c617bc797b8ce50060b5894bd7fc Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 18:06:31 +0800
4Subject: [PATCH 5/6] kv/rocksdb_cache: mark Shard() const
5
6it does not mutate anything, so mark it `const`.
7
8Signed-off-by: Kefu Chai <kchai@redhat.com>
9
10Upstream-Status: Backport [0296ac4458c0be0609f033e15b0fa8c6c9c20049]
11
12Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
13---
14 src/kv/rocksdb_cache/ShardedCache.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
18index 4d3ca302..f98421a0 100644
19--- a/src/kv/rocksdb_cache/ShardedCache.h
20+++ b/src/kv/rocksdb_cache/ShardedCache.h
21@@ -136,7 +136,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
22 // return Hash(s.data(), s.size(), 0);
23 }
24
25- uint32_t Shard(uint32_t hash) {
26+ uint32_t Shard(uint32_t hash) const {
27 // Note, hash >> 32 yields hash in gcc, not the zero we expect!
28 return (num_shard_bits_ > 0) ? (hash >> (32 - num_shard_bits_)) : 0;
29 }
30--
312.33.0
32
diff --git a/recipes-extended/ceph/ceph/0006-rocksdb-build-with-rocksdb-7.y.z.patch b/recipes-extended/ceph/ceph/0006-rocksdb-build-with-rocksdb-7.y.z.patch
new file mode 100644
index 00000000..c7ca704f
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0006-rocksdb-build-with-rocksdb-7.y.z.patch
@@ -0,0 +1,109 @@
1From 06f23837c757ff7a8aa8db4e5965e25e9ca69f45 Mon Sep 17 00:00:00 2001
2From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
3Date: Mon, 23 May 2022 07:41:26 -0400
4Subject: [PATCH 6/6] rocksdb: build with rocksdb-7.y.z
5
6RocksDB 7, specifically 7.2.2 has landed in Fedora 37/rawhide.
7
8https://tracker.ceph.com/issues/55730
9
10Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
11(cherry picked from commit eea10281e6f4078f261b05b6bd9c9c9aec129201)
12
13Upstream-Status: Backport [be3ca10e60ade9dbe7d3e5cb018f32c7cc97e2ed]
14
15Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
16---
17 src/kv/RocksDBStore.cc | 7 ++-----
18 src/kv/rocksdb_cache/BinnedLRUCache.cc | 2 +-
19 src/kv/rocksdb_cache/BinnedLRUCache.h | 2 +-
20 src/kv/rocksdb_cache/ShardedCache.cc | 2 +-
21 src/kv/rocksdb_cache/ShardedCache.h | 4 ++--
22 5 files changed, 7 insertions(+), 10 deletions(-)
23
24diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
25index 328277e5..115d28fc 100644
26--- a/src/kv/RocksDBStore.cc
27+++ b/src/kv/RocksDBStore.cc
28@@ -728,19 +728,16 @@ int64_t RocksDBStore::estimate_prefix_size(const string& prefix,
29 {
30 auto cf = get_cf_handle(prefix);
31 uint64_t size = 0;
32- uint8_t flags =
33- //rocksdb::DB::INCLUDE_MEMTABLES | // do not include memtables...
34- rocksdb::DB::INCLUDE_FILES;
35 if (cf) {
36 string start = key_prefix + string(1, '\x00');
37 string limit = key_prefix + string("\xff\xff\xff\xff");
38 rocksdb::Range r(start, limit);
39- db->GetApproximateSizes(cf, &r, 1, &size, flags);
40+ db->GetApproximateSizes(cf, &r, 1, &size);
41 } else {
42 string start = combine_strings(prefix , key_prefix);
43 string limit = combine_strings(prefix , key_prefix + "\xff\xff\xff\xff");
44 rocksdb::Range r(start, limit);
45- db->GetApproximateSizes(default_cf, &r, 1, &size, flags);
46+ db->GetApproximateSizes(default_cf, &r, 1, &size);
47 }
48 return size;
49 }
50diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
51index 1e6ba7af..c4918355 100644
52--- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
53+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
54@@ -531,7 +531,7 @@ void BinnedLRUCache::DisownData() {
55 #endif // !__SANITIZE_ADDRESS__
56 }
57
58-#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
59+#if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
60 DeleterFn BinnedLRUCache::GetDeleter(Handle* handle) const
61 {
62 return reinterpret_cast<const BinnedLRUHandle*>(handle)->deleter;
63diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
64index ba0c2720..266667f0 100644
65--- a/src/kv/rocksdb_cache/BinnedLRUCache.h
66+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
67@@ -309,7 +309,7 @@ class BinnedLRUCache : public ShardedCache {
68 virtual size_t GetCharge(Handle* handle) const override;
69 virtual uint32_t GetHash(Handle* handle) const override;
70 virtual void DisownData() override;
71-#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
72+#if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
73 virtual DeleterFn GetDeleter(Handle* handle) const override;
74 #endif
75 // Retrieves number of elements in LRU, for unit test purpose only
76diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
77index 6cbd89ad..7d160f9c 100644
78--- a/src/kv/rocksdb_cache/ShardedCache.cc
79+++ b/src/kv/rocksdb_cache/ShardedCache.cc
80@@ -109,7 +109,7 @@ size_t ShardedCache::GetPinnedUsage() const {
81 return usage;
82 }
83
84-#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
85+#if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
86 DeleterFn ShardedCache::GetDeleter(Handle* handle) const
87 {
88 uint32_t hash = GetHash(handle);
89diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
90index f98421a0..855912d7 100644
91--- a/src/kv/rocksdb_cache/ShardedCache.h
92+++ b/src/kv/rocksdb_cache/ShardedCache.h
93@@ -83,11 +83,11 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
94 virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
95 virtual size_t GetPinnedUsage() const override;
96 virtual size_t GetCharge(Handle* handle) const = 0;
97-#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
98+#if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
99 virtual DeleterFn GetDeleter(Handle* handle) const override;
100 #endif
101 virtual void DisownData() override = 0;
102-#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
103+#if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
104 virtual void ApplyToAllEntries(
105 const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
106 DeleterFn deleter)>& callback,
107--
1082.33.0
109
diff --git a/recipes-extended/ceph/ceph_15.2.15.bb b/recipes-extended/ceph/ceph_15.2.15.bb
index f2ece8c7..14b4c978 100644
--- a/recipes-extended/ceph/ceph_15.2.15.bb
+++ b/recipes-extended/ceph/ceph_15.2.15.bb
@@ -17,6 +17,12 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
17 file://0001-buffer.h-add-missing-header-file-due-to-gcc-upgrade.patch \ 17 file://0001-buffer.h-add-missing-header-file-due-to-gcc-upgrade.patch \
18 file://0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch \ 18 file://0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch \
19 file://CVE-2021-3979.patch \ 19 file://CVE-2021-3979.patch \
20 file://0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch \
21 file://0002-kv-rocksdb_cache-reorder-ShardedCache-methods-declar.patch \
22 file://0003-kv-rocksdb_cache-define-DeleterFn-function-pointer-t.patch \
23 file://0004-kv-rocksdb_cache-implement-methods-required-by-rocks.patch \
24 file://0005-kv-rocksdb_cache-mark-Shard-const.patch \
25 file://0006-rocksdb-build-with-rocksdb-7.y.z.patch \
20" 26"
21 27
22SRC_URI[sha256sum] = "5dccdaff2ebe18d435b32bfc06f8b5f474bf6ac0432a6a07d144b7c56700d0bf" 28SRC_URI[sha256sum] = "5dccdaff2ebe18d435b32bfc06f8b5f474bf6ac0432a6a07d144b7c56700d0bf"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-21 04:07:44 +0000