From fccd794e0190bc7b569f635dc961664741dcb4f1 Mon Sep 17 00:00:00 2001 From: xieguangyao00 Date: Fri, 18 Oct 2024 14:05:00 +0800 Subject: [PATCH] Fix dpdk show numa pages (cherry picked from commit 8019a7335b7b99b1892d5cb601d1739117a5d972) --- ...hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch | 14 ++++++++++++++ oec-hardware.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch diff --git a/oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch b/oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch new file mode 100644 index 0000000..709bbdb --- /dev/null +++ b/oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch @@ -0,0 +1,14 @@ +diff -Naur rpm/tests/compatible/dpdk/hugepages.py oech/tests/compatible/dpdk/hugepages.py +--- rpm/tests/compatible/dpdk/hugepages.py 2024-09-25 15:21:01.000000000 +0800 ++++ oech/tests/compatible/dpdk/hugepages.py 2024-10-18 10:06:36.033839943 +0800 +@@ -62,6 +62,10 @@ + for numa_path in glob.glob('/sys/devices/system/node/node*'): + node = numa_path[29:] # slice after /sys/devices/system/node/node + path = os.path.join(numa_path, 'hugepages') ++ if not os.path.exists(path): ++ self.logger.info("%s doesn't exist" % path) ++ continue ++ + for hdir in os.listdir(path): + comm = self.command.run_cmd("cat %s/%s/nr_hugepages" % (path, hdir)) + pages = int(comm[0].strip('\n')) diff --git a/oec-hardware.spec b/oec-hardware.spec index ee0ca70..2aa3964 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -6,7 +6,7 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.6 -Release: 1 +Release: 2 Group: Development/Tools License: Mulan PSL v2 URL: https://gitee.com/openeuler/oec-hardware @@ -14,6 +14,7 @@ Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{v # patch fix issue Patch0001: oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch +Patch0002: oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -38,6 +39,7 @@ openEuler Hardware Compatibility Test Server %prep %setup -q -c %patch1 -p1 +%patch2 -p1 %build %ifarch x86_64 aarch64 @@ -85,6 +87,9 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve rm -rf /var/lock/oech.lock %changelog +* Fri Oct 18 2024 xieguangyao00 - 1.1.6-2 +- Fix the bug that dpdk test terminates when accessing numa node hugepages directory + * Tue Oct 15 2024 xiaochn - 1.1.6-1 - Fix bug that the raid test cannot identify PM8222-SHBA -- Gitee