fix blockcache

Author: Z-G-H1

src/storage/src/redis.cc

@@ -115,8 +115,18 @@ void Redis::GetRocksDBInfo(std::string &info, const char *prefix) {
     string_stream << "#" << prefix << "RocksDB" << "\r\n";
 
     auto write_stream_key_value=[&](const Slice& property, const char *metric) {
-        uint64_t value;
-        db_->GetAggregatedIntProperty(property, &value);
+        uint64_t value = 0;
+        // Avoids double-counting of shared cache.
+        if (share_block_cache_ && handles_.size() > 0 &&
+            (property == rocksdb::DB::Properties::kBlockCacheCapacity ||
+             property == rocksdb::DB::Properties::kBlockCacheUsage ||
+             property == rocksdb::DB::Properties::kBlockCachePinnedUsage)) {
+            std::string sval;
+            db_->GetProperty(handles_[0], property, &sval);
+            value = std::strtoull(sval.c_str(), nullptr, 10);
+        } else {
+            db_->GetAggregatedIntProperty(property, &value);
+        }
         string_stream << prefix << metric << ':' << value << "\r\n";
     };
 

src/storage/src/redis.h

@@ -122,6 +122,7 @@ class Redis {
   std::shared_ptr<LockMgr> lock_mgr_;
   rocksdb::DB* db_ = nullptr;
 
+  bool share_block_cache_ = false;
   std::vector<rocksdb::ColumnFamilyHandle*> handles_;
   rocksdb::WriteOptions default_write_options_;
   rocksdb::ReadOptions default_read_options_;

src/storage/src/redis_hashes.cc

@@ -64,6 +64,7 @@ Status RedisHashes::Open(const StorageOptions& storage_options, const std::strin
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Data CF
   column_families.emplace_back("data_cf", data_cf_ops);
+  share_block_cache_ = storage_options.share_block_cache;
   return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
@@ -81,6 +82,15 @@ Status RedisHashes::GetProperty(const std::string& property, uint64_t* out) {
   std::string value;
   db_->GetProperty(handles_[0], property, &value);
   *out = std::strtoull(value.c_str(), nullptr, 10);
+
+  // Avoids double counting when share_block_cache is enabled.
+  if (share_block_cache_ &&
+      (property == "rocksdb.block-cache-usage" ||
+       property == "rocksdb.block-cache-capacity" ||
+       property == "rocksdb.block-cache-pinned-usage")) {
+    return Status::OK();
+  }
+
   db_->GetProperty(handles_[1], property, &value);
   *out += std::strtoull(value.c_str(), nullptr, 10);
   return Status::OK();

src/storage/src/redis_lists.cc

@@ -71,6 +71,7 @@ Status RedisLists::Open(const StorageOptions& storage_options, const std::string
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Data CF
   column_families.emplace_back("data_cf", data_cf_ops);
+  share_block_cache_ = storage_options.share_block_cache;
   return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
@@ -88,6 +89,15 @@ Status RedisLists::GetProperty(const std::string& property, uint64_t* out) {
   std::string value;
   db_->GetProperty(handles_[0], property, &value);
   *out = std::strtoull(value.c_str(), nullptr, 10);
+
+  // Avoids double counting when share_block_cache is enabled.
+  if (share_block_cache_ &&
+      (property == "rocksdb.block-cache-usage" ||
+       property == "rocksdb.block-cache-capacity" ||
+       property == "rocksdb.block-cache-pinned-usage")) {
+    return Status::OK();
+  }
+
   db_->GetProperty(handles_[1], property, &value);
   *out += std::strtoull(value.c_str(), nullptr, 10);
   return Status::OK();

src/storage/src/redis_sets.cc

@@ -71,6 +71,7 @@ rocksdb::Status RedisSets::Open(const StorageOptions& storage_options, const std
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Member CF
   column_families.emplace_back("member_cf", member_cf_ops);
+  share_block_cache_ = storage_options.share_block_cache;
   return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
@@ -88,6 +89,15 @@ rocksdb::Status RedisSets::GetProperty(const std::string& property, uint64_t* ou
   std::string value;
   db_->GetProperty(handles_[0], property, &value);
   *out = std::strtoull(value.c_str(), nullptr, 10);
+
+  // Avoids double counting when share_block_cache is enabled.
+  if (share_block_cache_ &&
+      (property == "rocksdb.block-cache-usage" ||
+       property == "rocksdb.block-cache-capacity" ||
+       property == "rocksdb.block-cache-pinned-usage")) {
+    return rocksdb::Status::OK();
+  }
+
   db_->GetProperty(handles_[1], property, &value);
   *out += std::strtoull(value.c_str(), nullptr, 10);
   return rocksdb::Status::OK();

src/storage/src/redis_streams.cc

@@ -367,6 +367,7 @@ Status RedisStreams::Open(const StorageOptions& storage_options, const std::stri
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   // Data CF
   column_families.emplace_back("data_cf", data_cf_ops);
+  share_block_cache_ = storage_options.share_block_cache;
   return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
@@ -385,6 +386,15 @@ Status RedisStreams::GetProperty(const std::string& property, uint64_t* out) {
   std::string value;
   db_->GetProperty(handles_[0], property, &value);
   *out = std::strtoull(value.c_str(), nullptr, 10);
+
+  // Avoids double counting when share_block_cache is enabled.
+  if (share_block_cache_ &&
+      (property == "rocksdb.block-cache-usage" ||
+       property == "rocksdb.block-cache-capacity" ||
+       property == "rocksdb.block-cache-pinned-usage")) {
+    return Status::OK();
+  }
+
   db_->GetProperty(handles_[1], property, &value);
   *out += std::strtoull(value.c_str(), nullptr, 10);
   return Status::OK();

src/storage/src/redis_zsets.cc

@@ -83,6 +83,7 @@ Status RedisZSets::Open(const StorageOptions& storage_options, const std::string
   column_families.emplace_back(rocksdb::kDefaultColumnFamilyName, meta_cf_ops);
   column_families.emplace_back("data_cf", data_cf_ops);
   column_families.emplace_back("score_cf", score_cf_ops);
+  share_block_cache_ = storage_options.share_block_cache;
   return rocksdb::DB::Open(db_ops, db_path, column_families, &handles_, &db_);
 }
 
@@ -101,6 +102,16 @@ Status RedisZSets::GetProperty(const std::string& property, uint64_t* out) {
   std::string value;
   db_->GetProperty(handles_[0], property, &value);
   *out = std::strtoull(value.c_str(), nullptr, 10);
+
+  // If share_block_cache is enabled, block cache related properties are shared among CFs,
+  // so we only need to get the value from the first CF to avoid double counting.
+  if (share_block_cache_ &&
+      (property == "rocksdb.block-cache-usage" ||
+       property == "rocksdb.block-cache-capacity" ||
+       property == "rocksdb.block-cache-pinned-usage")) {
+    return Status::OK();
+  }
+
   db_->GetProperty(handles_[1], property, &value);
   *out += std::strtoull(value.c_str(), nullptr, 10);
   db_->GetProperty(handles_[2], property, &value);