From patchwork Tue Jul 4 11:40:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9824643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFA6B60237 for ; Tue, 4 Jul 2017 11:40:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E088B2811E for ; Tue, 4 Jul 2017 11:40:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D52D7283B4; Tue, 4 Jul 2017 11:40:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EDE32811E for ; Tue, 4 Jul 2017 11:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752161AbdGDLk0 (ORCPT ); Tue, 4 Jul 2017 07:40:26 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33945 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbdGDLkZ (ORCPT ); Tue, 4 Jul 2017 07:40:25 -0400 Received: by mail-wm0-f68.google.com with SMTP id p204so25784614wmg.1; Tue, 04 Jul 2017 04:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rOMHige5IU9n7Q/68e8NJlHKMrQrZ6/iQvSRxjZ8vTI=; b=eEFOXyKJuXTuLTRyeUJ6Oqlv3ionoSYFyABnYOMgkMJXJVr4Vun2c70BW+NbyJnbYG yzmlKdRKV8iZ0hdMOEyQISjyk0PdBE7DScLTrsTewmkWTdtuX5L+znsrraZkXicA46Qj Mzfz1u0CQbqzhPyFdrsA2aNIfOWK0SJFLC5Kh7GuOfwAOS1u/XivRh+8ZykP8Ldz0hbH 4bQwGhGtog1Z68oL6X7ogIF1cAdqJzJgRNxfGrfLMoWTjg1upzpfwd9iVZnzSeO6FxNA hJ23hoVEUQN75r7lL2YkLr4sxjtMTqs/4T6ujW/+iYm1PUfRsZcH+y15NJ0ro4Zew86L jipQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rOMHige5IU9n7Q/68e8NJlHKMrQrZ6/iQvSRxjZ8vTI=; b=gnK+pPHJ6FHsWvWwgP/KpFfrYGIf8tmn87VjkVNc55a0mHgYGDkxKM/4h+Ls+98Ly5 ZDlvd+ew4XfeEj5tMiqaXpZaA/+ndT4YQ+9I90mov2h8q93+BEZQyug/zKdJbNJFsRS5 xAf+vhMTfKL5CK61Cr0YZdE+PqFYlf+1JTcZbgNXGdxkhp9GdCb1eYE2N/Z0uRfys0ta gyY2PrMw+XX10Lvzfsh7iCTMobyDYMVcxXuFvqaqHNfeZRHAa793YKOIfeiNbvbl0VnJ /cMbgGydRBQc+c8hTOI03+kidmdKnO4H7Kl3uCg60k7DZm5U4TxIvFj7KTfwEnVKMPGf LSjw== X-Gm-Message-State: AIVw113cxgEkoBzklSFC5cABsP+QCRtK1bouUw8cnXWAAoqrcP5OiLJg d9I6VevO2eWDPtnU X-Received: by 10.28.137.199 with SMTP id l190mr7632421wmd.117.1499168424078; Tue, 04 Jul 2017 04:40:24 -0700 (PDT) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id 90sm18842912wrk.38.2017.07.04.04.40.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Jul 2017 04:40:23 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 5/7] overlay: test concurrent copy up of lower hardlinks Date: Tue, 4 Jul 2017 14:40:32 +0300 Message-Id: <1499168434-23859-6-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499168434-23859-1-git-send-email-amir73il@gmail.com> References: <1499168434-23859-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Two tasks make a modification concurrently on two hardlinks of a large lower inode. The copy up should be triggered by one of the tasks and the other should be waiting for copy up to complete. Both copy up targets should end up being upper hardlinks and both metadata changes should be visible in both hardlinks. With kernel <= v4.12, hardlinks are broken on copy up, meaning that copy up is performed independetly and the resulting upper copy up targets each have only one of the the metadata changes visible. Signed-off-by: Amir Goldstein --- tests/overlay/032 | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/overlay/032.out | 4 ++ tests/overlay/group | 1 + 3 files changed, 107 insertions(+) create mode 100755 tests/overlay/032 create mode 100644 tests/overlay/032.out diff --git a/tests/overlay/032 b/tests/overlay/032 new file mode 100755 index 0000000..9a7995e --- /dev/null +++ b/tests/overlay/032 @@ -0,0 +1,102 @@ +#! /bin/bash +# FS QA Test 032 +# +# Test concurrent copy up of lower hardlinks. +# +# Two tasks make a metadata change concurrently on two hardlinks of a large +# lower inode. The copy up should be triggers by one of the tasks and the +# other should be waiting for copy up to complete. Both copy up targets +# should end up being upper hardlinks and both metadata changes should be +# applied. +# +#----------------------------------------------------------------------- +# Copyright (C) 2017 CTERA Networks. All Rights Reserved. +# Author: Amir Goldstein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs overlay +_supported_os Linux +_require_scratch + +# Remove all files from previous tests +_scratch_mkfs + +# overlay copy_up doesn't deal with sparse file well, holes will be filled by +# zeros, so if both hardlinks are broken on copy up, we need (2*500M) free space +# on $OVL_BASE_SCRATCH_MNT. +_require_fs_space $OVL_BASE_SCRATCH_MNT $((500*1024*2)) + +# Create a large file in lower with 2 hardlinks +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +mkdir -p $lowerdir +touch $lowerdir/zero +$XFS_IO_PROG -c "truncate 500m" $lowerdir/zero +ln $lowerdir/zero $lowerdir/one +ln $lowerdir/zero $lowerdir/two + +_scratch_mount + +_do_cmd() +{ + echo "`date +%T` $1..." >> $seqres.full + eval "$1" + echo "`date +%T` ...$1" >> $seqres.full +} + +# Perform one modification on each hardlink (size and owner) +_do_cmd "echo >> $SCRATCH_MNT/one" & +# +# When hardlinks are broken and overlayfs supports concurrent copy up, +# $seqres.full will show that file two copy up started ~2s after file one +# copy up started and ended ~2s after file one copy up ended. +# With synchronized copy up of lower inodes, $seqres.full will show that +# file two copy up ended at the same time as file one copy up. +# +sleep 2 +_do_cmd "chown 100 $SCRATCH_MNT/two" & + +wait + +# Expect all hardlinks to show both metadata modifications +for f in zero one two; do + _ls_l -n $SCRATCH_MNT/$f | awk '{ print $2, $3, $5, $9 }' | _filter_scratch +done + +status=0 +exit diff --git a/tests/overlay/032.out b/tests/overlay/032.out new file mode 100644 index 0000000..0069740 --- /dev/null +++ b/tests/overlay/032.out @@ -0,0 +1,4 @@ +QA output created by 032 +3 100 524288001 SCRATCH_MNT/zero +3 100 524288001 SCRATCH_MNT/one +3 100 524288001 SCRATCH_MNT/two diff --git a/tests/overlay/group b/tests/overlay/group index 28df5b6..2baba3a 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -34,3 +34,4 @@ 029 auto quick 030 auto quick perms 031 auto quick whiteout +032 auto quick copyup hardlink