From: Luís Henriques <lhenriques@suse.de>
Date: Tue, 24 May 2022 09:42:56 +0000 (+0100)
Subject: ceph/001: skip metrics check if no copyfrom mount option is used
X-Git-Tag: v2022.05.29~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e57024a3058801af69660cae2028972690554b3f;p=xfstests-dev.git

ceph/001: skip metrics check if no copyfrom mount option is used

Checking the metrics is only valid if 'copyfrom' mount option is
explicitly set, otherwise the kernel won't be doing any remote object
copies.  Fix the logic to skip this metrics checking if 'copyfrom' isn't
used.

Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Zorro Lang <zlang@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/ceph/001 b/tests/ceph/001
index 7970ce35..060c4c45 100755
--- a/tests/ceph/001
+++ b/tests/ceph/001
@@ -86,11 +86,15 @@ check_copyfrom_metrics()
 	local copies=$4
 	local c1=$(get_copyfrom_total_copies)
 	local s1=$(get_copyfrom_total_size)
+	local hascopyfrom=$(_fs_options $TEST_DEV | grep "copyfrom")
 	local sum
 
-	if [ ! -d $metrics_dir ]; then
+	if [ ! -d "$metrics_dir" ]; then
 		return # skip metrics check if debugfs isn't mounted
 	fi
+	if [ -z "$hascopyfrom" ]; then
+		return # ... or if we don't have copyfrom mount option
+	fi
 
 	sum=$(($c0+$copies))
 	if [ $sum -ne $c1 ]; then