diff --git a/0001-LU-16042-tests-can-not-get-cache-size-on-Arm64.patch b/0001-LU-16042-tests-can-not-get-cache-size-on-Arm64.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f3ac0c3b863298b026237bdbbb9f16695bdec9d --- /dev/null +++ b/0001-LU-16042-tests-can-not-get-cache-size-on-Arm64.patch @@ -0,0 +1,43 @@ +From 9568e1e80ad995a8190ebb2a2d1da7b4f0f198d8 Mon Sep 17 00:00:00 2001 +From: Kevin Zhao +Date: Mon, 25 Jul 2022 15:53:44 +0800 +Subject: [PATCH] LU-16042 tests: can not get cache size on Arm64 + +This fix the test fail on Arm64, the cache size can not be +display on /proc/cpuinfo. And even in the VM and somee +older Arm64 CPU, we can not get the cachesize. So it's +better to fallback to a pre-set value here if we don't get +the cache size. + +Signed-off-by: Kevin Zhao +Change-Id: I17ce1d8accc69d1489db2071a2741b3927fff302 +Reviewed-on: https://review.whamcloud.com/48030 +Tested-by: jenkins +Tested-by: Maloo +Reviewed-by: Andreas Dilger +Reviewed-by: James Simmons +Reviewed-by: Oleg Drokin +--- + lustre/tests/sanity.sh | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh +index fec778e9fe..d16a7ae5dd 100755 +--- a/lustre/tests/sanity.sh ++++ b/lustre/tests/sanity.sh +@@ -15600,6 +15600,12 @@ test_155_big_load() { + free_min_max + local cache_size=$(do_facet ost$((MAXI+1)) \ + "awk '/cache/ {sum+=\\\$4} END {print sum}' /proc/cpuinfo") ++ ++ # LU-16042: can not get the cache size on Arm64 VM here, fallback to a ++ # pre-set value ++ if [ -z "$cache_size" ]; then ++ cache_size=256 ++ fi + local large_file_size=$((cache_size * 2)) + + echo "OSS cache size: $cache_size KB" +-- +2.33.0 + diff --git a/lustre.spec b/lustre.spec index baed0cf3160bf99746bcad9db19b8f22e51c4020..dc24d6103f919d1b1f3a6b58d00a7b7ee17f3f28 100644 --- a/lustre.spec +++ b/lustre.spec @@ -179,7 +179,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: 2.15.2 -Release: 3 +Release: 4 License: GPL-2.0-only AND LGPL-2.1-or-later Group: System Environment/Kernel Source: https://github.com/lustre/lustre-release/archive/refs/tags/%{version}.tar.gz @@ -198,6 +198,7 @@ BuildRoot: %{_tmppath}/lustre-%{version}-root Patch1: 0005-lustre.spec.in-Add-gcc-option-Wno-stringop-overflow.patch Patch2: 0001-LU-16117-build-Avoid-excessive-modpost-warnings.patch Patch3: 0001-LU-16662-autoconf-fix-configure-test-compile-for-CON.patch +Patch4: 0001-LU-16042-tests-can-not-get-cache-size-on-Arm64.patch %if %{with lustre_modules} Requires: %{requires_kmod_name} = %{requires_kmod_version} @@ -873,6 +874,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp %changelog +* Fri Jun 02 2023 Xinliang Liu - 2.15.2-4 +- Fix sanity test 155e,155f,155g,155h + * Thu Jun 01 2023 Xinliang Liu - 2.15.2-3 - Fix kmod-lustre-client-tests install warnings