test pr

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

@@ -25,7 +25,9 @@ jobs:
     name: "CentOS/9 - Build CacheLib with all dependencies"
     runs-on: ubuntu-latest
     # Docker container image name
-    container: "quay.io/centos/centos:stream9"
+    container: 
+      image: "quay.io/centos/centos:stream9"
+      options: --privileged
     steps:
       - name: "Show Head Commit"
         env:
@@ -90,9 +92,11 @@ jobs:
         run: ./contrib/build-package.sh -j -v -i fbthrift
       - name: "build CacheLib"
         # Build cachelib in debug mode (-d)
-        run: ./contrib/build-package.sh -j -v -i -d cachelib
+        run: ./contrib/build-package.sh -j -v -i -d -t cachelib
       - name: "run cachebench"
         run: ./opt/cachelib/bin/cachebench --json_test_config ./opt/cachelib/test_configs/simple_test.json
+      - name: "run cachebench tests"
+        run: cd ./opt/cachelib/tests/ && ../../../run_tests.sh
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

README.md

@@ -2,7 +2,7 @@
   <img width="500" height="140" alt="CacheLib" src="website/static/img/CacheLib-Logo-Large-transp.png">
 </p>
 
-# CacheLib
+# Multi-Tier CacheLib
 
 Pluggable caching engine to build and scale high performance cache services. See
 [www.cachelib.org](https://cachelib.org) for documentation and more information.

cachelib/allocator/CacheAllocator.h

@@ -4610,7 +4610,6 @@ CacheAllocator<CacheTrait>::getNextCandidate(TierId tid,
     if (chainedItem) {
       XDCHECK(toRecycleParent->isMoving());
       XDCHECK_EQ(evictedToNext->getRefCount(),2u);
-      (*stats_.chainedItemEvictions)[tid][pid][cid].inc();
       // check if by releasing the item we intend to, we actually
       // recycle the candidate.
       auto ret = releaseBackToAllocator(*candidate, RemoveContext::kEviction,

cachelib/common/tests/UtilTestsRSS.cpp

@@ -30,7 +30,7 @@ namespace tests {
 
 TEST(Util, MemRSS) {
   for (int i = 0; i < 10; i++) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
     auto val = util::getRSSBytes();
     EXPECT_GT(val, 0);
@@ -42,7 +42,7 @@ TEST(Util, MemRSS) {
     std::memset(reinterpret_cast<char*>(ptr), 5, len);
     // sleep to let the stat catch up.
     /* sleep override */
-    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     auto newVal = util::getRSSBytes();
     EXPECT_GT(newVal, val) << folly::sformat("newVal = {}, val = {}", newVal,
                                              val);

docker/build.sh

@@ -66,7 +66,7 @@ echo "Running build using Docker image: ${IMAGE_NAME}"
 #  - environment variables set (--env)
 #  - host directory containing source mounted (-v)
 #  - working directory set (-w)
-docker run --privileged=true --name=${CONTAINER_NAME} -i \
+docker run --privileged --name=${CONTAINER_NAME} -i \
 	${DOCKER_OPTS} \
 	--env http_proxy=${http_proxy} \
 	--env https_proxy=${https_proxy} \

docker/run-build.sh

@@ -2,23 +2,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2022, Intel Corporation
 
-set -e
-
-function sudo_password() {
-	echo ${USERPASS} | sudo -Sk $*
-}
-
-#cd ..
-#mkdir build
-#cd build
-#
 source /opt/rh/gcc-toolset-12/enable
-#
-#cmake ../cachelib -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=/opt -DCMAKE_BUILD_TYPE=Debug
-#sudo_password make install -j$(nproc)
-cd $WORKDIR
+cd /
 if [ -d "build-cachelib" ]; then
   rm -rf build-cachelib
 fi
-./contrib/build-package.sh -t -j -v -I /opt/ cachelib
+./$WORKDIR/contrib/build-package.sh -t -j -v -I /opt/ cachelib
 cd /opt/tests && $WORKDIR/run_tests.sh