fio: upgraded package to upstream
Upgraded sys-block/fio to version 3.17 on amd64, arm
Command used:
cros_portage_upgrade --board=eve:kukui --upgrade --unstable-ok
sys-block/fio
BUG=b:145629149,b:145635956
TEST=Check hardware_StorageFio.quick_integrity passes:
test_that servo hardware_StorageFio.quick_integrity
fio-3.2: PASS
fio-3.16: FAIL
fio-3.17: PASS
Check hardware_StorageStress.suspend on eve.
Change-Id: Idb4a3452b8682494e404f7a0c775c92a5d4973f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2021064
Tested-by: Trent Begin <tbegin@chromium.org>
Commit-Queue: Trent Begin <tbegin@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit 7d501484e6918a2bb801756b077b506191d019d5)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2086395
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
diff --git a/metadata/md5-cache/sys-block/fio-3.16 b/metadata/md5-cache/sys-block/fio-3.17
similarity index 93%
rename from metadata/md5-cache/sys-block/fio-3.16
rename to metadata/md5-cache/sys-block/fio-3.17
index def06ea..5d37ba7 100644
--- a/metadata/md5-cache/sys-block/fio-3.16
+++ b/metadata/md5-cache/sys-block/fio-3.17
@@ -10,6 +10,6 @@
RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) gnuplot? ( sci-visualization/gnuplot || ( ( dev-lang/python:3.6 dev-python/pandas[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pandas[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
REQUIRED_USE=gnuplot? ( || ( python_targets_python2_7 python_targets_python3_6 ) ) libressl? ( curl )
SLOT=0
-SRC_URI=https://brick.kernel.dk/snaps/fio-3.16.tar.bz2
-_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 931c328767d245c08a16a3f87be9ce9c toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
-_md5_=6c5a638a2f4e0193a3bc84c2421c95d8
+SRC_URI=https://brick.kernel.dk/snaps/fio-3.17.tar.bz2
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 1a4f6b5e7fa7b8da3f7d9753118d10c5 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
+_md5_=3b5f0e2fa38ac2d1f19423257a88c2bb
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 436d66f..7e58204 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1 +1 @@
-DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
+DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
new file mode 100644
index 0000000..52fb389
--- /dev/null
+++ b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
@@ -0,0 +1,60 @@
+From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Mon, 13 Jan 2020 16:35:10 -0800
+Subject: [PATCH] verify: Fix test to not check for numberio when verify_only
+ is true
+
+io->numberio can not be populated when verify_only is true, because
+do_dry_run() build and complete IOs immediately, so it can not replicate
+the numberio that was produced when the data was layered on the media.
+
+Without this fix, using write_random
+[write_stress]
+filename=${FILENAME}
+size=${FILESIZE}
+verify_only=${VERIFY_ONLY}
+readwrite=randwrite
+bs=4k
+ioengine=libaio
+iodepth=32
+direct=1
+do_verify=1
+verify=crc32c
+
+'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes,
+but
+'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails:
+"""verify_only option fails with verify: bad header numberio 1, wanted
+0""".
+The fix addresses the problem by not checking numberio.
+
+Fixes #732
+
+Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
+---
+ verify.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/verify.c b/verify.c
+index a2c0d41dbb8c..cf299ebf9643 100644
+--- a/verify.c
++++ b/verify.c
+@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td,
+ * For read-only workloads, the program cannot be certain of the
+ * last numberio written to a block. Checking of numberio will be
+ * done only for workloads that write data. For verify_only,
+- * numberio will be checked in the last iteration when the correct
+- * state of numberio, that would have been written to each block
+- * in a previous run of fio, has been reached.
++ * numberio check is skipped.
+ */
+ if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) &&
+ !td->o.time_based)
+- if (!td->o.verify_only || td->o.loops == 0)
++ if (!td->o.verify_only)
+ if (hdr->numberio != io_u->numberio) {
+ log_err("verify: bad header numberio %"PRIu16
+ ", wanted %"PRIu16,
+--
+2.23.0
+
diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.17.ebuild
similarity index 96%
rename from sys-block/fio/fio-3.16.ebuild
rename to sys-block/fio/fio-3.17.ebuild
index 9342f93..1e97edb 100644
--- a/sys-block/fio/fio-3.16.ebuild
+++ b/sys-block/fio/fio-3.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
inherit python-r1 toolchain-funcs
@@ -55,7 +55,7 @@
PATCHES=(
"${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-3.16-snprintf.patch
+ "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
)
python_check_deps() {
