.gitignore

@@ -9,4 +9,3 @@
 /cachelib-2024.02.19.00.tar.gz
 /cachelib-2024.07.22.00.tar.gz
 /cachelib-2024.08.19.00.tar.gz
-/cachelib-2025.02.03.00.tar.gz

cachelib-disable-binary_trace_gen.diff

@@ -1,43 +0,0 @@
---- a/cachelib/cachebench/CMakeLists.txt
-+++ b/cachelib/cachebench/CMakeLists.txt
-@@ -41,25 +41,6 @@ target_link_libraries(cachelib_cachebenc
-   gflags
- )
- 
--add_library (cachelib_binary_trace_gen
--  ./runner/Runner.cpp
--  ./runner/Stressor.cpp
--  ./util/CacheConfig.cpp
--  ./util/Config.cpp
--  ./workload/BlockChunkCache.cpp
--  ./workload/BlockChunkReplayGenerator.cpp
--  ./workload/PieceWiseCache.cpp
--  ./workload/OnlineGenerator.cpp
--  ./workload/WorkloadGenerator.cpp
--  ./workload/PieceWiseReplayGenerator.cpp
--  )
--add_dependencies(cachelib_binary_trace_gen thrift_generated_files)
--target_link_libraries(cachelib_binary_trace_gen PUBLIC
--  cachelib_datatype
--  cachelib_allocator
--  gflags
--)
--
- if ((CMAKE_SYSTEM_NAME STREQUAL Linux) AND
-     (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64))
- else()
-@@ -68,14 +49,11 @@ endif()
- 
- 
- add_executable (cachebench main.cpp)
--add_executable (binary_trace_gen binary_trace_gen.cpp)
- target_link_libraries(cachebench cachelib_cachebench)
--target_link_libraries(binary_trace_gen cachelib_binary_trace_gen)
- 
- install(
-   TARGETS
-      cachebench
--     binary_trace_gen
-   DESTINATION ${BIN_INSTALL_DIR}
- )
- 

cachelib-fix-DeviceTest-FDP.diff

@@ -1,6 +1,6 @@
 --- a/cachelib/navy/CMakeLists.txt
 +++ b/cachelib/navy/CMakeLists.txt
-@@ -105,7 +105,7 @@ if (BUILD_TESTS)
+@@ -103,7 +103,7 @@ if (BUILD_TESTS)
    add_test (scheduler/tests/ThreadPoolJobSchedulerTest.cpp)
    add_test (driver/tests/DriverTest.cpp)
    if (NOT MISSING_FALLOCATE)

cachelib-fix-libcachelib_allocator-MockDevice.diff

@@ -0,0 +1,26 @@
+--- a/cachelib/allocator/nvmcache/NavySetup.cpp
++++ b/cachelib/allocator/nvmcache/NavySetup.cpp
+@@ -23,7 +23,6 @@
+ #include "cachelib/allocator/nvmcache/NavyConfig.h"
+ #include "cachelib/navy/Factory.h"
+ #include "cachelib/navy/scheduler/JobScheduler.h"
+-#include "cachelib/navy/testing/MockDevice.h"
+ 
+ namespace facebook {
+ namespace cachelib {
+@@ -369,6 +368,7 @@ std::unique_ptr<navy::AbstractCache> cre
+     bool itemDestructorEnabled) {
+   auto device = createDevice(config, std::move(encryptor));
+ 
++#if 0
+   if (config.hasDeviceDataCorruptionForTesting()) {
+     // Use mock device. This is for testing
+     auto mockDevice = std::make_unique<navy::MockDevice>(
+@@ -392,6 +392,7 @@ std::unique_ptr<navy::AbstractCache> cre
+ 
+     device = std::move(mockDevice);
+   }
++#endif
+ 
+   auto proto = cachelib::navy::createCacheProto();
+   auto* devicePtr = device.get();

cachelib.spec

@@ -9,7 +9,7 @@
 %bcond_with check
 
 %global forgeurl https://github.com/facebook/CacheLib
-%global tag 2025.02.03.00
+%global tag 2024.08.19.00
 %global date %(echo %{tag} | sed -e 's|.00$||' | sed -e 's|\\.||g')
 # disable forge macro snapinfo generation
 # https://pagure.io/fedora-infra/rpmautospec/issue/240
@@ -27,10 +27,10 @@ Summary:        Pluggable caching engine for scale high performance cache servic
 License:        Apache-2.0
 URL:            %forgeurl
 Source:         %{url}/archive/v%{tag}/%{name}-%{tag}.tar.gz
+# allocator/nvmecache/NavySetup.cpp should not reference test code
+Patch:          %{name}-fix-libcachelib_allocator-MockDevice.diff
 # DeviceTest needs common/FdpNvme.cpp. Disable for now
 Patch:          %{name}-fix-DeviceTest-FDP.diff
-# incomplete dependencies, will sort out later
-Patch:          %{name}-disable-binary_trace_gen.diff
 # needed on EL8; its gtest does not come with cmake files
 Patch100:       %{name}-find-gtest.patch
 # Workaround for gcc issue (still needed on epel9 x86_64)

series

@@ -1,2 +1,2 @@
+cachelib-fix-libcachelib_allocator-MockDevice.diff
 cachelib-fix-DeviceTest-FDP.diff
-cachelib-disable-binary_trace_gen.diff

sources

@@ -1 +1 @@
-SHA512 (cachelib-2025.02.03.00.tar.gz) = 439e4941ed0ab42916342d8e702c31def0ae36ef52153ebac9d6b8bb26e9a9cef677ba1352ec5ffb4b962db8cca54151cde534c54e4427df2820a63ffb862ecd
+SHA512 (cachelib-2024.08.19.00.tar.gz) = 6d8f2be8b772770f924c101a5a4ec9ff3f1e5ee6f7d3eba28102debceadb3de4174347cf9e6eaaba1b6d0a10a8466d4ee325ee21d5f6b931b4603805264ae145