[upstream] use getCacheSize() in shm construction

.github/workflows/build-cachelib-centos-8-1.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-centos-8-1
 on:
 #  push:
+  pull_request:
   schedule:
      - cron:  '0 11 * * 1,3,5'
 jobs:

.github/workflows/build-cachelib-centos-8-5.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-centos-8.5
 on:
 #   push:
+  pull_request:
   schedule:
      - cron:  '0 9 * * *'
 jobs:

.github/workflows/build-cachelib-debian-10.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-debian-10
 on:
 #  push:
+  pull_request:
   schedule:
      - cron:  '0 13 * * *'
 jobs:
@@ -51,6 +52,9 @@ jobs:
           g++ - || true
       - name: "checkout sources"
         uses: actions/checkout@v2
+      - name: "Add Git safe directory"
+        # Workaround for Docker image bug (GitHub issue #199).
+        run: git config --system --add safe.directory $GITHUB_WORKSPACE
       - name: "Install Prerequisites"
         run: ./contrib/build.sh -S -B
       - name: "Test: update-submodules"

.github/workflows/build-cachelib-fedora-36.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-fedora-36
 on:
 #  push:
+  pull_request:
   schedule:
      - cron:  '0 19 * * *'
 jobs:

.github/workflows/build-cachelib-rockylinux-8.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-rockylinux-8.6
 on:
 #   push:
+  pull_request:
   schedule:
      - cron:  '0 15 * * 2,4,6'
 jobs:

.github/workflows/build-cachelib-rockylinux-9.yml

@@ -14,6 +14,7 @@
 name: build-cachelib-rockylinux-9.0
 on:
 #   push:
+  pull_request:
   schedule:
      - cron:  '0 17 * * *'
 jobs:

.github/workflows/build-cachelib-ubuntu-18.yml

@@ -19,6 +19,7 @@
 name: build-cachelib-ubuntu-18
 on:
 #  push:
+  pull_request:
   schedule:
     - cron:  '0 5 * * 2,4,6'
 jobs:

.github/workflows/build-cachelib-ubuntu-20.yml

@@ -15,6 +15,7 @@
 name: build-cachelib-ubuntu-20
 on:
 #  push:
+  pull_request:
   schedule:
     - cron:  '0 5 * * 1,3,5'
 jobs:

.github/workflows/build-cachelib-ubuntu-22.yml

@@ -15,6 +15,7 @@
 name: build-cachelib-ubuntu-22
 on:
 #  push:
+  pull_request:
   schedule:
     - cron:  '0 7 * * *'
 jobs:

README.md

@@ -50,7 +50,7 @@ cd CacheLib
 Re-running `./contrib/build.sh` will update CacheLib and its dependencies
 to their latest versions and rebuild them.
 
-See [build](https://cachelib.org/docs/installation/installation) for more details about
+See [build](https://cachelib.org/docs/installation/) for more details about
 the building and installation process.
 
 
@@ -77,3 +77,18 @@ https://www.facebook.com/whitehat
 
 Facebook's security team will triage your report and determine whether or not is
 it eligible for a bounty under our program.
+
+
+## Build status
+
+Clicking on a badge will show you the recent builds for that OS. If your target OS's build is failing, you may wish to check recent issues and PRs for known workarounds.
+
+- [![CentOS 8.1](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-centos-8-1.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-centos-8-1.yml?query=event%3Aschedule)
+- [![CentOS 8.5](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-centos-8-5.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-centos-8-5.yml?query=event%3Aschedule)
+- [![Debian 10](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-debian-10.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-debian-10.yml?query=event%3Aschedule)
+- [![Fedora 36](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-fedora-36.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-fedora-36.yml?query=event%3Aschedule)
+- [![Rocky Linux 8](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-rockylinux-8.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-rockylinux-8.yml?query=event%3Aschedule)
+- [![Rocky Linux 9](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-rockylinux-9.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-rockylinux-9.yml?query=event%3Aschedule)
+- [![Ubuntu 18](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-18.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-18.yml?query=event%3Aschedule)
+- [![Ubuntu 20](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-20.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-20.yml?query=event%3Aschedule)
+- [![Ubuntu 22](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-22.yml/badge.svg?event=schedule)](https://github.com/facebook/cachelib/actions/workflows/build-cachelib-ubuntu-22.yml?query=event%3Aschedule)

cachelib/adaptor/rocks_secondary_cache/tests/CachelibWrapperTest.cpp

@@ -116,6 +116,10 @@ class CachelibWrapperTest : public ::testing::Test {
   }
 #endif
 
+#if ROCKSDB_MAJOR > 8 || (ROCKSDB_MAJOR == 8 && ROCKSDB_MINOR >= 1)
+  static Cache::CacheItemHelper helper_no_secondary_;
+#endif
+
   static Cache::CacheItemHelper helper_;
 
   static Status SaveToCallbackFail(void* /*obj*/,
@@ -191,13 +195,23 @@ class CachelibWrapperTest : public ::testing::Test {
   std::string path_;
 };
 
+#if ROCKSDB_MAJOR > 8 || (ROCKSDB_MAJOR == 8 && ROCKSDB_MINOR >= 1)
+Cache::CacheItemHelper CachelibWrapperTest::helper_no_secondary_(
+    CacheEntryRole::kMisc, CachelibWrapperTest::DeletionCallback);
+#endif
+
 Cache::CacheItemHelper CachelibWrapperTest::helper_(
 #if ROCKSDB_MAJOR > 7 || (ROCKSDB_MAJOR == 7 && ROCKSDB_MINOR >= 10)
     CacheEntryRole::kMisc,
     CachelibWrapperTest::DeletionCallback,
     CachelibWrapperTest::SizeCallback,
     CachelibWrapperTest::SaveToCallback,
+#if ROCKSDB_MAJOR > 8 || (ROCKSDB_MAJOR == 8 && ROCKSDB_MINOR >= 1)
+    CachelibWrapperTest::CreateCallback,
+    &CachelibWrapperTest::helper_no_secondary_);
+#else
     CachelibWrapperTest::CreateCallback);
+#endif
 #else
     CachelibWrapperTest::SizeCallback,
     CachelibWrapperTest::SaveToCallback,
@@ -210,7 +224,12 @@ Cache::CacheItemHelper CachelibWrapperTest::helper_fail_(
     CachelibWrapperTest::DeletionCallback,
     CachelibWrapperTest::SizeCallback,
     CachelibWrapperTest::SaveToCallbackFail,
+#if ROCKSDB_MAJOR > 8 || (ROCKSDB_MAJOR == 8 && ROCKSDB_MINOR >= 1)
+    CachelibWrapperTest::CreateCallback,
+    &CachelibWrapperTest::helper_no_secondary_);
+#else
     CachelibWrapperTest::CreateCallback);
+#endif
 #else
     CachelibWrapperTest::SizeCallback,
     CachelibWrapperTest::SaveToCallbackFail,

cachelib/allocator/Cache.cpp

@@ -284,6 +284,25 @@ void CacheBase::updateGlobalCacheStats(const std::string& statPrefix) const {
   counters_.updateDelta(statPrefix + "reaper.skipped_slabs",
                         stats.numReaperSkippedSlabs);
 
+  counters_.updateDelta(statPrefix + "rebalancer.runs",
+                        stats.rebalancerStats.numRuns);
+  counters_.updateDelta(statPrefix + "rebalancer.rebalanced_slabs",
+                        stats.rebalancerStats.numRebalancedSlabs);
+  counters_.updateCount(statPrefix + "rebalancer.latency.loop_last_ms",
+                        stats.rebalancerStats.lastRebalanceTimeMs);
+  counters_.updateCount(statPrefix + "rebalancer.latency.loop_avg_ms",
+                        stats.rebalancerStats.avgRebalanceTimeMs);
+
+  counters_.updateCount(statPrefix + "rebalancer.latency.release_last_ms",
+                        stats.rebalancerStats.lastReleaseTimeMs);
+  counters_.updateCount(statPrefix + "rebalancer.latency.release_avg_ms",
+                        stats.rebalancerStats.avgReleaseTimeMs);
+
+  counters_.updateCount(statPrefix + "rebalancer.latency.pick_last_ms",
+                        stats.rebalancerStats.lastPickTimeMs);
+  counters_.updateCount(statPrefix + "rebalancer.latency.pick_avg_ms",
+                        stats.rebalancerStats.avgPickTimeMs);
+
   const auto slabReleaseStats = getSlabReleaseStats();
   counters_.updateDelta(statPrefix + "slabs.rebalancer_runs",
                         slabReleaseStats.numSlabReleaseForRebalanceAttempts);