[PATCH] generic/075: no need to move the .fsxlog to the same directory

[PATCH] generic/075: no need to move the .fsxlog to the same directory

[xiubli]

From: Xiubo Li <xiubli@redhat.com>

Actually it was trying to move the '075.$_n.fsxlog' from results
directory to the same results directory.

Fixes: https://tracker.ceph.com/issues/58834
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 tests/generic/075 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/generic/075 b/tests/generic/075
index 9f24ad41..03a394a6 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -57,7 +57,6 @@ _do_test()
     then
 	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
 	mv $out/$seq.$_n $seqres.$_n.full
-	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog
 	od -xAx $seqres.$_n.full > $seqres.$_n.bad
 	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
 	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
-- 
2.31.1

Re: [PATCH] generic/075: no need to move the .fsxlog to the same directory

[Xiubo Li]

Ping.

What's the status of this patch ?

Thanks

- Xiubo


On 01/03/2023 10:07, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
>
> Actually it was trying to move the '075.$_n.fsxlog' from results
> directory to the same results directory.
>
> Fixes: https://tracker.ceph.com/issues/58834
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>   tests/generic/075 | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/tests/generic/075 b/tests/generic/075
> index 9f24ad41..03a394a6 100755
> --- a/tests/generic/075
> +++ b/tests/generic/075
> @@ -57,7 +57,6 @@ _do_test()
>       then
>   	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
>   	mv $out/$seq.$_n $seqres.$_n.full
> -	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog
>   	od -xAx $seqres.$_n.full > $seqres.$_n.bad
>   	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
>   	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood

-- 
Best Regards,

Xiubo Li (李秀波)

Email: xiubli@redhat.com/xiubli@ibm.com
Slack: @Xiubo Li

Re: [PATCH] generic/075: no need to move the .fsxlog to the same directory

[Zorro Lang]

On Wed, Mar 01, 2023 at 10:07:30AM +0800, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
> 
> Actually it was trying to move the '075.$_n.fsxlog' from results
> directory to the same results directory.
> 
> Fixes: https://tracker.ceph.com/issues/58834
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>  tests/generic/075 | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/generic/075 b/tests/generic/075
> index 9f24ad41..03a394a6 100755
> --- a/tests/generic/075
> +++ b/tests/generic/075
> @@ -57,7 +57,6 @@ _do_test()
>      then
>  	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
>  	mv $out/$seq.$_n $seqres.$_n.full
> -	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog

Hmm... Thoese $seq, $seqnum, $seqres, $RESULT_DIR and $REPORT_DIR are mess for
me too :-D

From the logic of xfstests/check:

  if $OPTIONS_HAVE_SECTIONS; then
          export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
          REPORT_DIR="$RESULT_BASE/$section"
  else
          export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
          REPORT_DIR="$RESULT_BASE"
  fi
  seqres="$REPORT_DIR/$seqnum"


I think "$RESULT_DIR"/$seq equal to "$seqres", so this change makes sense to me.
(Not sure if there're some special situations which I don't know :)

The generic/075 is too old, lots of code in it can be removed or refactored, so
I think it's not worth changing it bit by bit, I can refactor it totally, or if
you'd like, you can do that.

Thanks,
Zorro

>  	od -xAx $seqres.$_n.full > $seqres.$_n.bad
>  	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
>  	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
> -- 
> 2.31.1
> 

Re: [PATCH] generic/075: no need to move the .fsxlog to the same directory

[Xiubo Li]

On 20/03/2023 22:37, Zorro Lang wrote:
> On Wed, Mar 01, 2023 at 10:07:30AM +0800, xiubli@redhat.com wrote:
>> From: Xiubo Li <xiubli@redhat.com>
>>
>> Actually it was trying to move the '075.$_n.fsxlog' from results
>> directory to the same results directory.
>>
>> Fixes: https://tracker.ceph.com/issues/58834
>> Signed-off-by: Xiubo Li <xiubli@redhat.com>
>> ---
>>   tests/generic/075 | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/tests/generic/075 b/tests/generic/075
>> index 9f24ad41..03a394a6 100755
>> --- a/tests/generic/075
>> +++ b/tests/generic/075
>> @@ -57,7 +57,6 @@ _do_test()
>>       then
>>   	echo "    fsx ($_param) failed, $? - compare $seqres.$_n.{good,bad,fsxlog}"
>>   	mv $out/$seq.$_n $seqres.$_n.full
>> -	mv "$RESULT_DIR"/$seq.$_n.fsxlog $seqres.$_n.fsxlog
> Hmm... Thoese $seq, $seqnum, $seqres, $RESULT_DIR and $REPORT_DIR are mess for
> me too :-D
>
>  From the logic of xfstests/check:
>
>    if $OPTIONS_HAVE_SECTIONS; then
>            export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;${RESULT_BASE}/$section;"`
>            REPORT_DIR="$RESULT_BASE/$section"
>    else
>            export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
>            REPORT_DIR="$RESULT_BASE"
>    fi
>    seqres="$REPORT_DIR/$seqnum"
>
>
> I think "$RESULT_DIR"/$seq equal to "$seqres", so this change makes sense to me.
> (Not sure if there're some special situations which I don't know :)
>
> The generic/075 is too old, lots of code in it can be removed or refactored, so
> I think it's not worth changing it bit by bit, I can refactor it totally, or if
> you'd like, you can do that.

Yeah, I can do that later, but not recently.

I may add some more tests in future and then I can improve this together.

Thanks Zorro,

- Xiubo

> Thanks,
> Zorro
>
>>   	od -xAx $seqres.$_n.full > $seqres.$_n.bad
>>   	od -xAx "$RESULT_DIR"/$seq.$_n.fsxgood > $seqres.$_n.good
>>   	rm -f "$RESULT_DIR"/$seq.$_n.fsxgood
>> -- 
>> 2.31.1
>>
-- 
Best Regards,

Xiubo Li (李秀波)

Email: xiubli@redhat.com/xiubli@ibm.com
Slack: @Xiubo Li