!59 [sync] PR-52: iolog: fix disk stats issue

From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333

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 11:15:56 +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 1aeb7a7..8314787 100644
+--- a/iolog.c
++++ b/iolog.c
+@@ -722,6 +722,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
+

fio.spec

@@ -3,11 +3,15 @@
 
 Name:           fio
 Version:        3.29
-Release:        3
+Release:        4
 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 python3-devel zlib-devel numactl-devel librdmacm-devel gcc
 %ifnarch s390
 BuildRequires:  gperftools-devel
@@ -61,6 +65,9 @@ export EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %{_mandir}/man1/*
 
 %changelog
+* Mon May 27 2024 cenhuilin <cenhuilin@kylinos.cn> - 3.29-4
+- iolog: fix disk stats issue
+
 * Tue Mar 5 2024 wangxiaomeng <wangxiaomeng@klinos.cn> - 3.29-3
 - Add BuildRequires gperftools-devel to link tcmalloc.