From patchwork Sun Mar 15 13:33:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11438869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0285B13B1 for ; Sun, 15 Mar 2020 13:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCEBB205C9 for ; Sun, 15 Mar 2020 13:33:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VaDUmGGi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728604AbgCONdW (ORCPT ); Sun, 15 Mar 2020 09:33:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49366 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728598AbgCONdW (ORCPT ); Sun, 15 Mar 2020 09:33:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584279200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=F0qV79AvNdNly7o+w9X0S3mmgiS3Ul1yLdu9Hnq4m/s=; b=VaDUmGGinrojLMCwo35tQ4HCPdm4Nf44x1hw1srsPR+mkMyE4Xj4S6/3acgtw1RUX5eQNg bc4l3srbAjwndRZqa5Xy3omUMjRVUU8p70T1JmPIJl+Vd1rauR/zsVDwxAOTVox/Mkk6W3 IVl/8Zcvgbt3kOEv0sjAkyO2uCpSIS0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-7CEW2smDMSWEA1APpKlv4w-1; Sun, 15 Mar 2020 09:33:16 -0400 X-MC-Unique: 7CEW2smDMSWEA1APpKlv4w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 572DB800D50; Sun, 15 Mar 2020 13:33:15 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-121.pek2.redhat.com [10.72.12.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 182071001B2B; Sun, 15 Mar 2020 13:33:13 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org Subject: [PATCH v2] generic: per-type quota timers set/get test Date: Sun, 15 Mar 2020 21:33:10 +0800 Message-Id: <20200315133310.6455-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Set different grace time, make sure each of quota (user, group and project) timers can be set (by setquota) and get (by repquota) correctly. Signed-off-by: Zorro Lang --- V2 did below changes: 1) Filter default quota timer. 2) Try to merge the case from Darrick: https://marc.info/?l=fstests&m=158207247224104&w=2 Please review, feel free to tell me if anything wrong. Thanks, Zorro tests/generic/594 | 104 ++++++++++++++++++++++++++++++++++++++++++ tests/generic/594.out | 50 ++++++++++++++++++++ tests/generic/group | 1 + 3 files changed, 155 insertions(+) create mode 100755 tests/generic/594 create mode 100644 tests/generic/594.out diff --git a/tests/generic/594 b/tests/generic/594 new file mode 100755 index 00000000..fb71a57b --- /dev/null +++ b/tests/generic/594 @@ -0,0 +1,104 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 594 +# +# Test per-type(user, group and project) filesystem quota timers, make sure +# each of grace time can be set/get properly. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/quota + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch +_require_quota + +_scratch_mkfs >$seqres.full 2>&1 +_scratch_enable_pquota +_qmount_option "usrquota,grpquota,prjquota" +_qmount +_require_prjquota $SCRATCH_DEV + +MIN=60 + +# get default time at first +def_time=`repquota -u $SCRATCH_MNT | \ + sed -n -e "/^Block/s/.* time: \(.*\); .* time: \(.*\)/\1 \2/p"` +echo "Default block and inode grace timers are: $def_time" >> $seqres.full + +filter_repquota() +{ + local blocktime=$1 + local inodetime=$2 + + _filter_scratch | sed -e "s,$blocktime,DEF_TIME,g" \ + -e "s,$inodetime,DEF_TIME,g" +} + +echo "1. set project quota timer" +setquota -t -P $((10 * MIN)) $((20 * MIN)) $SCRATCH_MNT +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time +echo + +echo "2. set group quota timer" +setquota -t -g $((30 * MIN)) $((40 * MIN)) $SCRATCH_MNT +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time +echo + +echo "3. set user quota timer" +setquota -t -u $((50 * MIN)) $((60 * MIN)) $SCRATCH_MNT +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time +echo + +# cycle mount, make sure the quota timers are still right +echo "4. cycle mount test-1" +_qmount +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time +echo + +# Run repair to force quota check +echo "5. fsck to force quota check" +_scratch_unmount +_repair_scratch_fs >> $seqres.full 2>&1 +echo + +# Remount (this time to run quotacheck) and check the limits. There's a bug +# in quotacheck where we would reset the ondisk default grace period to zero +# while the incore copy stays at whatever was read in prior to quotacheck. +# This will show up after the /next/ remount. +echo "6. cycle mount test-2" +_qmount +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time +echo + +# Remount and check the limits +echo "7. cycle mount test-3" +_qmount +repquota -ugP $SCRATCH_MNT | grep "Report\|^Block" | filter_repquota $def_time + +# success, all done +status=0 +exit diff --git a/tests/generic/594.out b/tests/generic/594.out new file mode 100644 index 00000000..f25e0fac --- /dev/null +++ b/tests/generic/594.out @@ -0,0 +1,50 @@ +QA output created by 594 +1. set project quota timer +*** Report for user quotas on device SCRATCH_DEV +Block grace time: DEF_TIME; Inode grace time: DEF_TIME +*** Report for group quotas on device SCRATCH_DEV +Block grace time: DEF_TIME; Inode grace time: DEF_TIME +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 + +2. set group quota timer +*** Report for user quotas on device SCRATCH_DEV +Block grace time: DEF_TIME; Inode grace time: DEF_TIME +*** Report for group quotas on device SCRATCH_DEV +Block grace time: 00:30; Inode grace time: 00:40 +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 + +3. set user quota timer +*** Report for user quotas on device SCRATCH_DEV +Block grace time: 00:50; Inode grace time: 01:00 +*** Report for group quotas on device SCRATCH_DEV +Block grace time: 00:30; Inode grace time: 00:40 +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 + +4. cycle mount test-1 +*** Report for user quotas on device SCRATCH_DEV +Block grace time: 00:50; Inode grace time: 01:00 +*** Report for group quotas on device SCRATCH_DEV +Block grace time: 00:30; Inode grace time: 00:40 +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 + +5. fsck to force quota check + +6. cycle mount test-2 +*** Report for user quotas on device SCRATCH_DEV +Block grace time: 00:50; Inode grace time: 01:00 +*** Report for group quotas on device SCRATCH_DEV +Block grace time: 00:30; Inode grace time: 00:40 +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 + +7. cycle mount test-3 +*** Report for user quotas on device SCRATCH_DEV +Block grace time: 00:50; Inode grace time: 01:00 +*** Report for group quotas on device SCRATCH_DEV +Block grace time: 00:30; Inode grace time: 00:40 +*** Report for project quotas on device SCRATCH_DEV +Block grace time: 00:10; Inode grace time: 00:20 diff --git a/tests/generic/group b/tests/generic/group index dc95b77b..a83f95cb 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -595,3 +595,4 @@ 591 auto quick rw pipe splice 592 auto quick encrypt 593 auto quick encrypt +594 auto quick quota