Merge pull request #22009 from markhpc/wip-bs-cache-autotune

common/PriorityCache: First Step toward priority based caching

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/kv/KeyValueDB.h
Simple merge

diff --cc src/kv/RocksDBStore.cc
Simple merge

diff --cc src/kv/RocksDBStore.h
index ce96199d0583cd02400f38feec6d32d6ec950f0f,756e74222afbcaea8f7c7f17fe76d76e3bf5c59d..81c94dfc426cb46199f9f4d6c3d5bc3019fc0697
--- 1/src/kv/RocksDBStore.h
--- 2/src/kv/RocksDBStore.h
+++ b/src/kv/RocksDBStore.h
@@@ -119,11 -120,8 +120,12 @@@ public
    bool disableWAL;
    bool enable_rmrange;
    void compact() override;
+   int64_t high_pri_watermark;
  
 +  void compact_async() override {
 +    compact_range_async(string(), string());
 +  }
 +
    int tryInterpret(const string& key, const string& val, rocksdb::Options &opt);
    int ParseOptionsFromString(const string& opt_str, rocksdb::Options &opt);
    static int _test_init(const string& dir);

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.h
Simple merge