!60 [sync] PR-54: iolog: fix disk stats issue

From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333
fix disk stats issue
2024-05-28 01:15:48 +00:00 · 2024-05-27 17:43:09 +08:00 · 2021-07-23 02:03:15 +00:00 · 2021-07-23 09:30:37 +08:00 · 2020-11-10 15:30:47 +08:00 · 2020-11-10 14:56:31 +08:00
2 changed files with 54 additions and 1 deletions
--- a/0001-fix-disk-stats-issue.patch
+++ b/0001-fix-disk-stats-issue.patch
@ -0,0 +1,31 @@
+From c492cb1a9b1c327e985c89eb517d58bd5323880c Mon Sep 17 00:00:00 2001
+From: Yong Gang <yygcode@gmail.com>
+Date: Mon, 27 May 2024 14:07:34 +0800
+Subject: [PATCH] iolog: fix disk stats issue
+In the iolog replay scenario, the disk util in the td structure is
+not initialized, resulting in the disk stats not being correctly
+updated.
+
+Fixes: #1735
+
+Signed-off-by: Yong Gang <yygcode@gmail.com>
+---
+ iolog.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/iolog.c b/iolog.c
+index 6e44119..7bc44e6 100644
+--- a/iolog.c
+++ b/iolog.c
+@@ -585,6 +585,8 @@ bool init_iolog(struct thread_data *td)
+ 	if (!ret)
+ 		td_verror(td, EINVAL, "failed initializing iolog");
+ 
+	init_disk_util(td);
+
+ 	return ret;
+ }
+ 
+-- 
+2.33.0
+
--- a/fio.spec
+++ b/fio.spec
@ -1,16 +1,20 @@
 Name:           fio
 Version:        3.7
-Release:        3
+Release:        8
 Summary:        Versatile IO workload generator
 License:        GPLv2
 URL:            http://git.kernel.dk/?p=fio.git;a=summary
 Source:         http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2
+#https://github.com/axboe/fio/pull/1736
+Patch0001:      0001-fix-disk-stats-issue.patch
+
 BuildRequires:  libaio-devel zlib-devel librbd1-devel numactl-devel librdmacm-devel

 %ifarch x86_64
 BuildRequires:  libpmem-devel libpmemblk-devel
 %endif

+Requires:       fio-help

 %description
 fio is a tool used to spawn many threads or processes that perform a specific type
@ -45,5 +49,23 @@ export EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %{_mandir}/man1/*

 %changelog
+* Mon May 27 2024 cenhuilin <cenhuilin@kylinos.cn> - 3.7-8
+- iolog: fix disk stats issue
+
+* Wed Jul 21 2021 lingsheng <lingsheng@huawei.com> - 3.7-7
+- Remove unnecessary buildrequire gdb
+
+* Mon Nov 09 2020 huanghaitao <huanghaitao8@huawei.com> -3.7-6
+- Make help package required by fio
+
+* Tue Aug 18 2020 senlin<xiasenlin1@huawei.com> -3.7-5
+- add release for update
+
+* Sat Mar 21 2020 huzunhao<huzunhao@huawei.com> - 3.7-4
+- Type: NA
+- ID: NA
+- SUG: NA
+- DESC: add buildrequire gdb
+
 * Wed Nov 27 2019 likexin<likexin4@huawei.com> - 3.7-3
 - Package init
Author	SHA1	Message	Date
openeuler-ci-bot	af5aa92f21	!60 [sync] PR-54: iolog: fix disk stats issue From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333	2024-05-28 01:15:48 +00:00
cenhuilin	f2b41fe2b7	fix disk stats issue (cherry picked from commit 37503b835c41944c7f5731580f8301682c44366d)	2024-05-27 17:43:09 +08:00
openeuler-ci-bot	8effcd3d02	!17 Remove unnecessary buildrequire gdb From: @ultra_planet Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-07-23 02:03:15 +00:00
lingsheng	c72da98c66	Remove unnecessary buildrequire gdb	2021-07-23 09:30:37 +08:00
openeuler-ci-bot	155343636f	!14 Make help package be required From: @hht8 Reviewed-by: @small_leek Signed-off-by: @small_leek	2020-11-10 15:30:47 +08:00
hht8	3cd9f4c6cf	Make help package be required	2020-11-10 14:56:31 +08:00
openeuler-ci-bot	265de9f2ac	!8 add version for update Merge pull request !8 from small_leek/openEuler-20.03-LTS	2020-08-18 21:43:05 +08:00
small_leek	12579a0040	add release for update	2020-08-18 21:39:46 +08:00
openeuler-ci-bot	8c820d49dd	!3 optimization the spec Merge pull request !3 from huzunhao/master	2020-03-22 00:12:30 +08:00
songnannan	840b5077ed	add buildrequire gdb	2020-03-21 22:03:00 +08:00