From 75bbf0a908d51a3003f1d828615cf8a7952cc4ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:10:31 +0000 Subject: [PATCH 1/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8595ee4fe2a7ec97cd28eb19e28a633d9d342696 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 7 Feb 2025 14:59:42 -0600 Subject: [PATCH 2/4] Update to the 2025.02.03.00 tag; Fixes: RHBZ#2341686 Signed-off-by: Michel Lind --- .gitignore | 1 + cachelib-disable-binary_trace_gen.diff | 43 +++++++++++++++++++ cachelib-fix-DeviceTest-FDP.diff | 2 +- ...-fix-libcachelib_allocator-MockDevice.diff | 26 ----------- cachelib.spec | 6 +-- series | 2 +- sources | 2 +- 7 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 cachelib-disable-binary_trace_gen.diff delete mode 100644 cachelib-fix-libcachelib_allocator-MockDevice.diff diff --git a/.gitignore b/.gitignore index d5f4bd2..e0522c2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 diff --git a/cachelib-disable-binary_trace_gen.diff b/cachelib-disable-binary_trace_gen.diff new file mode 100644 index 0000000..84b8cee --- /dev/null +++ b/cachelib-disable-binary_trace_gen.diff @@ -0,0 +1,43 @@ +--- 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} + ) + diff --git a/cachelib-fix-DeviceTest-FDP.diff b/cachelib-fix-DeviceTest-FDP.diff index 26c5566..424b24c 100644 --- a/cachelib-fix-DeviceTest-FDP.diff +++ b/cachelib-fix-DeviceTest-FDP.diff @@ -1,6 +1,6 @@ --- a/cachelib/navy/CMakeLists.txt +++ b/cachelib/navy/CMakeLists.txt -@@ -103,7 +103,7 @@ if (BUILD_TESTS) +@@ -105,7 +105,7 @@ if (BUILD_TESTS) add_test (scheduler/tests/ThreadPoolJobSchedulerTest.cpp) add_test (driver/tests/DriverTest.cpp) if (NOT MISSING_FALLOCATE) diff --git a/cachelib-fix-libcachelib_allocator-MockDevice.diff b/cachelib-fix-libcachelib_allocator-MockDevice.diff deleted file mode 100644 index 94e07aa..0000000 --- a/cachelib-fix-libcachelib_allocator-MockDevice.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 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( -@@ -392,6 +392,7 @@ std::unique_ptr cre - - device = std::move(mockDevice); - } -+#endif - - auto proto = cachelib::navy::createCacheProto(); - auto* devicePtr = device.get(); diff --git a/cachelib.spec b/cachelib.spec index 2736b2a..28eedaf 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -9,7 +9,7 @@ %bcond_with check %global forgeurl https://github.com/facebook/CacheLib -%global tag 2024.08.19.00 +%global tag 2025.02.03.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) diff --git a/series b/series index 2e56495..e1b4b30 100644 --- a/series +++ b/series @@ -1,2 +1,2 @@ -cachelib-fix-libcachelib_allocator-MockDevice.diff cachelib-fix-DeviceTest-FDP.diff +cachelib-disable-binary_trace_gen.diff diff --git a/sources b/sources index 833868c..6d89fce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cachelib-2024.08.19.00.tar.gz) = 6d8f2be8b772770f924c101a5a4ec9ff3f1e5ee6f7d3eba28102debceadb3de4174347cf9e6eaaba1b6d0a10a8466d4ee325ee21d5f6b931b4603805264ae145 +SHA512 (cachelib-2025.02.03.00.tar.gz) = 439e4941ed0ab42916342d8e702c31def0ae36ef52153ebac9d6b8bb26e9a9cef677ba1352ec5ffb4b962db8cca54151cde534c54e4427df2820a63ffb862ecd From 2d4e90d1f14f4ffe1900505ed7c473cc43e750cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:01:54 +0000 Subject: [PATCH 3/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a3605889d268601b3ea1902155f9836d69788096 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 12 Nov 2025 10:05:07 +0000 Subject: [PATCH 4/4] Rebuilt for gtest 1.17.0