import 14.2.4 nautilus point release

[ceph.git] / ceph / src / rocksdb / cache / sharded_cache.cc

diff --git a/ceph/src/rocksdb/cache/sharded_cache.cc b/ceph/src/rocksdb/cache/sharded_cache.cc
index 6a0a22282115ca1b3d49dd8106b7ce24c9e2853b..a48a32185bf1f252d89540e2beb036173a701534 100644 (file)
--- a/ceph/src/rocksdb/cache/sharded_cache.cc
+++ b/ceph/src/rocksdb/cache/sharded_cache.cc
@@ -20,8 +20,10 @@
 namespace rocksdb {
 
 ShardedCache::ShardedCache(size_t capacity, int num_shard_bits,
-                           bool strict_capacity_limit)
-    : num_shard_bits_(num_shard_bits),
+                           bool strict_capacity_limit,
+                           std::shared_ptr<MemoryAllocator> allocator)
+    : Cache(std::move(allocator)),
+      num_shard_bits_(num_shard_bits),
       capacity_(capacity),
       strict_capacity_limit_(strict_capacity_limit),
       last_id_(1) {}
@@ -142,6 +144,9 @@ std::string ShardedCache::GetPrintableOptions() const {
              strict_capacity_limit_);
     ret.append(buffer);
   }
+  snprintf(buffer, kBufferSize, "    memory_allocator : %s\n",
+           memory_allocator() ? memory_allocator()->Name() : "None");
+  ret.append(buffer);
   ret.append(GetShard(0)->GetPrintableOptions());
   return ret;
 }