From 1bb73f1a3086a352df849b0b81de515d818fd234 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:56:23 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ee3f9a88a90d7f2f28b9c7dc7a367ba0157a31a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:05:39 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6810455f46ff5c9a2562ba909e8f5ca96e8011fe Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 25 Jan 2024 10:47:58 -0600 Subject: [PATCH 03/11] Update to 2024.01.22.00 Signed-off-by: Michel Lind --- .gitignore | 1 + cachelib-find-gtest.patch | 11 +++++------ cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch | 4 ++-- cachelib.spec | 10 +++++----- series | 2 ++ sources | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 series diff --git a/.gitignore b/.gitignore index d57fe65..a194474 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cachelib-2023.09.11.00.tar.gz /cachelib-2023.10.09.00.tar.gz /cachelib-2023.10.16.00.tar.gz +/cachelib-2024.01.22.00.tar.gz diff --git a/cachelib-find-gtest.patch b/cachelib-find-gtest.patch index b9cce71..5a874d1 100644 --- a/cachelib-find-gtest.patch +++ b/cachelib-find-gtest.patch @@ -1,6 +1,6 @@ diff '--color=auto' -ruN CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/cmake/FindGTest.cmake CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/cmake/FindGTest.cmake ---- CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/cmake/FindGTest.cmake 1969-12-31 16:00:00.000000000 -0800 -+++ CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/cmake/FindGTest.cmake 2022-02-24 20:08:51.087790319 -0800 +--- /dev/null ++++ b/cachelib/cmake/FindGTest.cmake @@ -0,0 +1,54 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# @@ -56,10 +56,9 @@ diff '--color=auto' -ruN CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cache +if(GTEST_FOUND AND NOT GTEST_FIND_QUIETLY) + message(STATUS "GTEST: ${GTEST_INCLUDE_DIRS}") +endif() -diff '--color=auto' -ruN CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/CMakeLists.txt CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/CMakeLists.txt ---- CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/CMakeLists.txt 2021-12-20 07:22:18.000000000 -0800 -+++ CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/CMakeLists.txt 2022-02-24 20:12:39.078602510 -0800 -@@ -93,7 +93,7 @@ +--- a/cachelib/CMakeLists.txt ++++ b/cachelib/CMakeLists.txt +@@ -97,7 +97,7 @@ find_package(Boost REQUIRED COMPONENTS system filesystem regex context program_options thread) find_package(Gflags REQUIRED) find_package(Glog REQUIRED) diff --git a/cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch b/cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch index 7fc45a2..5b88103 100644 --- a/cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch +++ b/cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch @@ -1,5 +1,5 @@ ---- CacheLib-bd22b0eb79f7e2326f77a22c278c48e454882291/cachelib/compact_cache/CCacheFixedLruBucket.h.orig 2022-03-15 02:49:38.000000000 +0900 -+++ CacheLib-bd22b0eb79f7e2326f77a22c278c48e454882291/cachelib/compact_cache/CCacheFixedLruBucket.h 2022-07-20 02:03:03.028073719 +0900 +--- a/cachelib/compact_cache/CCacheFixedLruBucket.h ++++ b/cachelib/compact_cache/CCacheFixedLruBucket.h @@ -274,7 +274,7 @@ struct FixedLruBucket { static void copyValue(T* destPtr, const T* srcPtr) { XDCHECK(destPtr != nullptr); diff --git a/cachelib.spec b/cachelib.spec index db7ebf6..fd62a4d 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -9,7 +9,7 @@ %bcond_with check %global forgeurl https://github.com/facebook/CacheLib -%global tag 2023.10.16.00 +%global tag 2024.01.22.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 @@ -41,9 +41,10 @@ BuildRequires: clang %else BuildRequires: gcc-c++ %endif -BuildRequires: fbthrift-devel -BuildRequires: fizz-devel -BuildRequires: folly-devel +BuildRequires: fbthrift-devel = %{tag} +BuildRequires: fizz-devel = %{tag} +BuildRequires: folly-devel = %{tag} +BuildRequires: mvfst-devel = %{tag} %if %{with build_tests} BuildRequires: gmock-devel %endif @@ -52,7 +53,6 @@ BuildRequires: gmock-devel BuildRequires: gtest-devel BuildRequires: libdwarf-devel BuildRequires: libzstd-devel -BuildRequires: mvfst-devel BuildRequires: numactl-devel BuildRequires: wangle-devel BuildRequires: zlib-devel diff --git a/series b/series new file mode 100644 index 0000000..cd0f15d --- /dev/null +++ b/series @@ -0,0 +1,2 @@ +cachelib-find-gtest.patch +cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch diff --git a/sources b/sources index f1dffa0..e01fd4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cachelib-2023.10.16.00.tar.gz) = ce702bc1bfe137e63277f9ec777cf3a16861e37158ae4b8b1afed1e349f569c7e0a78a2fea99b56885ec45136c89260df8f3b43a440d977471b8fcde0cfd28c8 +SHA512 (cachelib-2024.01.22.00.tar.gz) = 9f58568f379a2f28f44526055820c75010af79cf65b8a800182ea3d218a0a158ffab9d9e93f9dcd07c5febc06bf74f4c92e15d26c26f4ef9cf6dc933bc3ec87d From 11e1367e67f73f7dbefdf011d5bdb51dc3ed8ea6 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Sat, 24 Feb 2024 08:26:47 -0600 Subject: [PATCH 04/11] Update to 2024.02.19.00 Signed-off-by: Michel Lind --- .gitignore | 1 + cachelib.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a194474..545ff02 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cachelib-2023.10.09.00.tar.gz /cachelib-2023.10.16.00.tar.gz /cachelib-2024.01.22.00.tar.gz +/cachelib-2024.02.19.00.tar.gz diff --git a/cachelib.spec b/cachelib.spec index fd62a4d..aa4c717 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -9,7 +9,7 @@ %bcond_with check %global forgeurl https://github.com/facebook/CacheLib -%global tag 2024.01.22.00 +%global tag 2024.02.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 diff --git a/sources b/sources index e01fd4c..4e7905a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cachelib-2024.01.22.00.tar.gz) = 9f58568f379a2f28f44526055820c75010af79cf65b8a800182ea3d218a0a158ffab9d9e93f9dcd07c5febc06bf74f4c92e15d26c26f4ef9cf6dc933bc3ec87d +SHA512 (cachelib-2024.02.19.00.tar.gz) = b0ac756fede25119c77515819c32b7b6ab5d0236d3e0e39d6609c6de32184f4a59dc34100f4805c7bcd749c641036c30f2e16b57e0881408e0760b4d11fb03c9 From 00ff326c121a6ff1b1e826c660b55d16ab95a17a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:50:27 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1741a377a780bf965787b8426672329e5d1cc42f Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 26 Jul 2024 14:19:26 -0500 Subject: [PATCH 06/11] Update to 2024.07.22.00 Signed-off-by: Michel Lind --- .gitignore | 1 + cachelib-fix-DeviceTest-FDP.diff | 11 ++++++++ ...-fix-libcachelib_allocator-MockDevice.diff | 26 +++++++++++++++++++ cachelib-fix-nvme-data-gating.diff | 18 +++++++++++++ cachelib-fmt11-fix.diff | 11 ++++++++ cachelib.spec | 13 ++++++++-- series | 6 +++-- sources | 2 +- 8 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 cachelib-fix-DeviceTest-FDP.diff create mode 100644 cachelib-fix-libcachelib_allocator-MockDevice.diff create mode 100644 cachelib-fix-nvme-data-gating.diff create mode 100644 cachelib-fmt11-fix.diff diff --git a/.gitignore b/.gitignore index 545ff02..9e27303 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cachelib-2023.10.16.00.tar.gz /cachelib-2024.01.22.00.tar.gz /cachelib-2024.02.19.00.tar.gz +/cachelib-2024.07.22.00.tar.gz diff --git a/cachelib-fix-DeviceTest-FDP.diff b/cachelib-fix-DeviceTest-FDP.diff new file mode 100644 index 0000000..26c5566 --- /dev/null +++ b/cachelib-fix-DeviceTest-FDP.diff @@ -0,0 +1,11 @@ +--- a/cachelib/navy/CMakeLists.txt ++++ b/cachelib/navy/CMakeLists.txt +@@ -103,7 +103,7 @@ if (BUILD_TESTS) + add_test (scheduler/tests/ThreadPoolJobSchedulerTest.cpp) + add_test (driver/tests/DriverTest.cpp) + if (NOT MISSING_FALLOCATE) +- add_test (common/tests/DeviceTest.cpp) ++# add_test (common/tests/DeviceTest.cpp) + endif() + add_test (block_cache/tests/AllocatorTest.cpp) + add_test (block_cache/tests/RegionManagerTest.cpp) diff --git a/cachelib-fix-libcachelib_allocator-MockDevice.diff b/cachelib-fix-libcachelib_allocator-MockDevice.diff new file mode 100644 index 0000000..94e07aa --- /dev/null +++ b/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 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-fix-nvme-data-gating.diff b/cachelib-fix-nvme-data-gating.diff new file mode 100644 index 0000000..b76186a --- /dev/null +++ b/cachelib-fix-nvme-data-gating.diff @@ -0,0 +1,18 @@ +--- a/cachelib/navy/common/FdpNvme.h ++++ b/cachelib/navy/common/FdpNvme.h +@@ -83,6 +83,7 @@ enum nvme_io_opcode { + nvme_cmd_io_mgmt_recv = 0x12, + nvme_cmd_io_mgmt_send = 0x1d, + }; ++#endif + + // NVMe specific data for a device + // +@@ -127,7 +128,6 @@ class NvmeData { + uint32_t maxTfrSize_; + uint64_t startLba_; + }; +-#endif + + // FDP specific info and handling + // diff --git a/cachelib-fmt11-fix.diff b/cachelib-fmt11-fix.diff new file mode 100644 index 0000000..e50c731 --- /dev/null +++ b/cachelib-fmt11-fix.diff @@ -0,0 +1,11 @@ +--- a/cachelib/navy/common/Types.h ++++ b/cachelib/navy/common/Types.h +@@ -83,6 +83,8 @@ inline std::ostream& operator<<(std::ost + inline std::ostream& operator<<(std::ostream& os, DestructorEvent e) { + return os << "DestructorEvent::" << toString(e); + } ++ ++inline int format_as(Status s) { return folly::to_underlying(s); } + } // namespace navy + } // namespace cachelib + } // namespace facebook diff --git a/cachelib.spec b/cachelib.spec index aa4c717..a792356 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -9,7 +9,7 @@ %bcond_with check %global forgeurl https://github.com/facebook/CacheLib -%global tag 2024.02.19.00 +%global tag 2024.07.22.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 @@ -26,7 +26,16 @@ Summary: Pluggable caching engine for scale high performance cache servic License: Apache-2.0 URL: %forgeurl -Source0: %{url}/archive/v%{tag}/%{name}-%{tag}.tar.gz +Source: %{url}/archive/v%{tag}/%{name}-%{tag}.tar.gz +# add missing formatter for Status +Patch: %{name}-fmt11-fix.diff +# NvmeData is not part of nvme.h, it was wrongly gated +# so if we have nvme.h it is missing +Patch: %{name}-fix-nvme-data-gating.diff +# 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 # 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 cd0f15d..3bc10fb 100644 --- a/series +++ b/series @@ -1,2 +1,4 @@ -cachelib-find-gtest.patch -cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch +cachelib-fmt11-fix.diff +cachelib-fix-nvme-data-gating.diff +cachelib-fix-libcachelib_allocator-MockDevice.diff +cachelib-fix-DeviceTest-FDP.diff diff --git a/sources b/sources index 4e7905a..c97cd52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cachelib-2024.02.19.00.tar.gz) = b0ac756fede25119c77515819c32b7b6ab5d0236d3e0e39d6609c6de32184f4a59dc34100f4805c7bcd749c641036c30f2e16b57e0881408e0760b4d11fb03c9 +SHA512 (cachelib-2024.07.22.00.tar.gz) = 7942501f40565bf59347fb6427901abbfcc0ae631082eb1e214a89f5ae021ae5bb52e847fbac4050e4468c6170c0d8df8af75c2d5dbb757e049e1e508260d2fa From 049869bec6e090aa56d44ebd75803960d4d2c643 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Wed, 21 Aug 2024 14:00:40 -0500 Subject: [PATCH 07/11] Update to the 2024.08.19.00 tag Signed-off-by: Michel Lind --- .gitignore | 1 + cachelib-fix-nvme-data-gating.diff | 18 ------------------ cachelib-fmt11-fix.diff | 11 ----------- cachelib.spec | 7 +------ series | 2 -- sources | 2 +- 6 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 cachelib-fix-nvme-data-gating.diff delete mode 100644 cachelib-fmt11-fix.diff diff --git a/.gitignore b/.gitignore index 9e27303..d5f4bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cachelib-2024.01.22.00.tar.gz /cachelib-2024.02.19.00.tar.gz /cachelib-2024.07.22.00.tar.gz +/cachelib-2024.08.19.00.tar.gz diff --git a/cachelib-fix-nvme-data-gating.diff b/cachelib-fix-nvme-data-gating.diff deleted file mode 100644 index b76186a..0000000 --- a/cachelib-fix-nvme-data-gating.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- a/cachelib/navy/common/FdpNvme.h -+++ b/cachelib/navy/common/FdpNvme.h -@@ -83,6 +83,7 @@ enum nvme_io_opcode { - nvme_cmd_io_mgmt_recv = 0x12, - nvme_cmd_io_mgmt_send = 0x1d, - }; -+#endif - - // NVMe specific data for a device - // -@@ -127,7 +128,6 @@ class NvmeData { - uint32_t maxTfrSize_; - uint64_t startLba_; - }; --#endif - - // FDP specific info and handling - // diff --git a/cachelib-fmt11-fix.diff b/cachelib-fmt11-fix.diff deleted file mode 100644 index e50c731..0000000 --- a/cachelib-fmt11-fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cachelib/navy/common/Types.h -+++ b/cachelib/navy/common/Types.h -@@ -83,6 +83,8 @@ inline std::ostream& operator<<(std::ost - inline std::ostream& operator<<(std::ostream& os, DestructorEvent e) { - return os << "DestructorEvent::" << toString(e); - } -+ -+inline int format_as(Status s) { return folly::to_underlying(s); } - } // namespace navy - } // namespace cachelib - } // namespace facebook diff --git a/cachelib.spec b/cachelib.spec index a792356..2736b2a 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -9,7 +9,7 @@ %bcond_with check %global forgeurl https://github.com/facebook/CacheLib -%global tag 2024.07.22.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,11 +27,6 @@ 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 -# add missing formatter for Status -Patch: %{name}-fmt11-fix.diff -# NvmeData is not part of nvme.h, it was wrongly gated -# so if we have nvme.h it is missing -Patch: %{name}-fix-nvme-data-gating.diff # allocator/nvmecache/NavySetup.cpp should not reference test code Patch: %{name}-fix-libcachelib_allocator-MockDevice.diff # DeviceTest needs common/FdpNvme.cpp. Disable for now diff --git a/series b/series index 3bc10fb..2e56495 100644 --- a/series +++ b/series @@ -1,4 +1,2 @@ -cachelib-fmt11-fix.diff -cachelib-fix-nvme-data-gating.diff cachelib-fix-libcachelib_allocator-MockDevice.diff cachelib-fix-DeviceTest-FDP.diff diff --git a/sources b/sources index c97cd52..833868c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cachelib-2024.07.22.00.tar.gz) = 7942501f40565bf59347fb6427901abbfcc0ae631082eb1e214a89f5ae021ae5bb52e847fbac4050e4468c6170c0d8df8af75c2d5dbb757e049e1e508260d2fa +SHA512 (cachelib-2024.08.19.00.tar.gz) = 6d8f2be8b772770f924c101a5a4ec9ff3f1e5ee6f7d3eba28102debceadb3de4174347cf9e6eaaba1b6d0a10a8466d4ee325ee21d5f6b931b4603805264ae145 From 75bbf0a908d51a3003f1d828615cf8a7952cc4ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:10:31 +0000 Subject: [PATCH 08/11] 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 09/11] 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 10/11] 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 11/11] Rebuilt for gtest 1.17.0