Re: [PATCH v2] ceph/001: skip metrics check if no copyfrom mount option is used

From: "Luís Henriques" <lhenriques@suse.de>
To: Zorro Lang <zlang@redhat.com>
Cc: fstests@vger.kernel.org, ceph-devel@vger.kernel.org
Subject: Re: [PATCH v2] ceph/001: skip metrics check if no copyfrom mount option is used
Date: Tue, 7 Jun 2022 15:33:07 +0100	[thread overview]
Message-ID: <Yp9ho/m0m3Su8ZzA@suse.de> (raw)
In-Reply-To: <20220524165926.dkighy46hi75mg6s@zlang-mailbox>

On Wed, May 25, 2022 at 12:59:26AM +0800, Zorro Lang wrote:
> On Tue, May 24, 2022 at 10:42:56AM +0100, Luís Henriques wrote:
> > 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>
> > ---
> >  tests/ceph/001 | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > 
> > Changes since v1:
> > - Quoted 'hascopyfrom' variable in 'if' statement; while there, added
> >   quotes to the 'if' statement just above.
> 
> Good to me,
> Reviewed-by: Zorro Lang <zlang@redhat.com>

Ping.

Cheers,
--
Luís

> > 
> > diff --git a/tests/ceph/001 b/tests/ceph/001
> > index 7970ce352bab..060c4c450091 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
> > 
> 