ceph/001: skip metrics check if no copyfrom mount option is used
PATCH 1/1 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.
--- tests/ceph/001 | 4 ++++ 1 file changed, 4 insertions(+)
tests/ceph/001 +4 -0
@@ -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 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
Quoted 7 lines · Luís Henriques
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 <[email protected]>---
The code logic looks good to me, but I'm not familiar with cephfs, so if there's not review points or objection from ceph-fs, I'll merge this patch this week.
Thanks,
Zorro
Quoted 24 lines
tests/ceph/001 | 4 ++++ 1 file changed, 4 insertions(+)tests/ceph/001 +4
-0@@ -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 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
Quoted 20 lines · Zorro Lang
Quoted 7 lines · Luís Henriques
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 <[email protected]>---
The code logic looks good to me, but I'm not familiar with cephfs, so if there's not review points or objection from ceph-fs, I'll merge this patch this week.
Reviewed-by Zorro Lang <[email protected]>Thanks,
ZorroQuoted 3 lines
tests/ceph/001 | 4 ++++ 1 file changed, 4 insertions(+)
Quoted 9 lines
tests/ceph/001 check_copyfrom_metrics() · line 89
Quoted 9 lines
tests/ceph/001 +1
-0@@ -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")
Oh, I forgot to metion that:
I don't know what's the mount option output format at here, can't sure if "grep -w" is needed, or need special pattern.
Quoted 6 lines
tests/ceph/001 check_copyfrom_metrics() · line 95
Quoted 6 lines
tests/ceph/001 +1
-0local sum if [ ! -d $metrics_dir ]; then return # skip metrics check if debugfs isn't mounted fi + if [ -z $hascopyfrom ]; then
I think better to use quotes ("$hascopyfrom") at here.
Quoted 6 lines
Quoted 6 lines
tests/ceph/001 +2
-0+ return # ... or if we don't have copyfrom mount option + fi sum=$(($c0+$copies)) if [ $sum -ne $c1 ]; then
Quoted 33 lines · Zorro Lang
Quoted 20 lines · Zorro Lang
Quoted 7 lines · Luís Henriques
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 <[email protected]>---
The code logic looks good to me, but I'm not familiar with cephfs, so if there's not review points or objection from ceph-fs, I'll merge this patch this week.
Reviewed-by Zorro Lang <[email protected]>Thanks,
ZorroQuoted 3 lines
tests/ceph/001 | 4 ++++ 1 file changed, 4 insertions(+)Quoted 9 lines
tests/ceph/001 check_copyfrom_metrics() · line 89
Quoted 9 lines
tests/ceph/001 +1
-0@@ -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")Oh, I forgot to metion that:
Quoted 2 lines
I don't know what's the mount option output format at here, can't sure if "grep -w" is needed, or need special pattern.
I don't think there's a need for the '-w' here; the mount option is exactly that string:
192.168.155.1:40768:/ on /mnt type ceph (rw,relatime,name=user,secret=<hidden>,acl,copyfrom)
Quoted 8 lines
Quoted 6 lines
tests/ceph/001 check_copyfrom_metrics() · line 95
Quoted 6 lines
tests/ceph/001 +1
-0local sum if [ ! -d $metrics_dir ]; then return # skip metrics check if debugfs isn't mounted fi + if [ -z $hascopyfrom ]; thenI think better to use quotes ("$hascopyfrom") at here.
I'll send v2 with that changed. Thank you for your feedback.
Cheers,
Signature · 1 line
Luís
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
tests/ceph/001 +2
-0+ return # ... or if we don't have copyfrom mount option + fi sum=$(($c0+$copies)) if [ $sum -ne $c1 ]; then