From 43aca60458b48c1e80ec99154b7381b8b06ed9ee Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Tue, 25 May 2021 11:24:48 +0200
Subject: [PATCH] scripts/fio-wrapper: Move devices sync to configure_devices()

This is to make sure we sync devices for both nvmf and iscsi
protocols.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ifec6cc2d240a5b22b73e9f4087ae328568e4fe4a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8042
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
---
 scripts/fio-wrapper | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/fio-wrapper b/scripts/fio-wrapper
index 7eaafdb590..8c93f31baf 100755
--- a/scripts/fio-wrapper
+++ b/scripts/fio-wrapper
@@ -60,9 +60,6 @@ get_nvme() {
 		done
 	done
 	blocks=("${blocks[@]##*/}")
-	if [[ -e $rootdir/scripts/sync_dev_uevents.sh ]]; then
-		"$rootdir/scripts/sync_dev_uevents.sh" block/disk "${blocks[@]}"
-	fi > /dev/null
 	printf '%s\n' "${blocks[@]}"
 }
 
@@ -82,6 +79,10 @@ get_devices() {
 configure_devices() {
 	local devs=("$@") dev qd
 
+	if [[ -e $rootdir/scripts/sync_dev_uevents.sh ]]; then
+		"$rootdir/scripts/sync_dev_uevents.sh" block/disk "${devs[@]}"
+	fi > /dev/null
+
 	for dev in "${devs[@]}"; do
 		qd=128
 		# Disable all merge tries"