From 56171bcb41d4225b54ab24aa4add4552b7aa6bee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lu=C3=ADs=20Henriques?= Date: Mon, 27 Jun 2022 11:26:31 +0100 Subject: [PATCH] ceph/005: verify correct statfs behaviour with quotas MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When using a directory with 'max_bytes' quota as a base for a mount, statfs shall use that 'max_bytes' value as the total disk size. That value shall be used even when using subdirectory as base for the mount. A bug was found where, when this subdirectory also had a 'max_files' quota, the real filesystem size would be returned instead of the parent 'max_bytes' quota value. This test case verifies this bug is fixed. Signed-off-by: Luís Henriques Reviewed-by: Xiubo Li Signed-off-by: Zorro Lang --- common/rc | 13 +++++++++++++ tests/ceph/005 | 39 +++++++++++++++++++++++++++++++++++++++ tests/ceph/005.out | 4 ++++ 3 files changed, 56 insertions(+) create mode 100755 tests/ceph/005 create mode 100644 tests/ceph/005.out diff --git a/common/rc b/common/rc index 3c072c16f..918026b55 100644 --- a/common/rc +++ b/common/rc @@ -4277,6 +4277,19 @@ _get_available_space() echo $((avail_kb * 1024)) } +# get the total space in bytes +# +_get_total_space() +{ + if [ -z "$1" ]; then + echo "Usage: _get_total_space " + exit 1 + fi + local total_kb; + total_kb=`$DF_PROG $1 | tail -n1 | awk '{ print $3 }'` + echo $(($total_kb * 1024)) +} + # return device size in kb _get_device_size() { diff --git a/tests/ceph/005 b/tests/ceph/005 new file mode 100755 index 000000000..fd71d9135 --- /dev/null +++ b/tests/ceph/005 @@ -0,0 +1,39 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2022 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 005 +# +# Make sure statfs reports correct total size when: +# 1. using a directory with 'max_byte' quota as base for a mount +# 2. using a subdirectory of the above directory with 'max_files' quota +# +. ./common/preamble +_begin_fstest auto quick quota + +_supported_fs ceph +_require_scratch + +_scratch_mount +mkdir -p "$SCRATCH_MNT/quota-dir/subdir" + +# set quota +quota=$((2 ** 30)) # 1G +$SETFATTR_PROG -n ceph.quota.max_bytes -v "$quota" "$SCRATCH_MNT/quota-dir" +$SETFATTR_PROG -n ceph.quota.max_files -v "$quota" "$SCRATCH_MNT/quota-dir/subdir" +_scratch_unmount + +SCRATCH_DEV_ORIG="$SCRATCH_DEV" +SCRATCH_DEV="$SCRATCH_DEV/quota-dir" _scratch_mount +echo ceph quota size is $(_get_total_space "$SCRATCH_MNT") bytes +SCRATCH_DEV="$SCRATCH_DEV_ORIG/quota-dir" _scratch_unmount + +SCRATCH_DEV="$SCRATCH_DEV_ORIG/quota-dir/subdir" _scratch_mount +echo subdir ceph quota size is $(_get_total_space "$SCRATCH_MNT") bytes +SCRATCH_DEV="$SCRATCH_DEV_ORIG/quota-dir/subdir" _scratch_unmount + +echo "Silence is golden" + +# success, all done +status=0 +exit diff --git a/tests/ceph/005.out b/tests/ceph/005.out new file mode 100644 index 000000000..47798b1fc --- /dev/null +++ b/tests/ceph/005.out @@ -0,0 +1,4 @@ +QA output created by 005 +ceph quota size is 1073741824 bytes +subdir ceph quota size is 1073741824 bytes +Silence is golden -- 2.50.1