From patchwork Tue Aug 23 17:51:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 9296015 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 348C5607D0 for ; Tue, 23 Aug 2016 17:52:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 282FE28A4D for ; Tue, 23 Aug 2016 17:52:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CA5628AE9; Tue, 23 Aug 2016 17:52:20 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 73B2128A4D for ; Tue, 23 Aug 2016 17:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbcHWRwT (ORCPT ); Tue, 23 Aug 2016 13:52:19 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:60107 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753934AbcHWRwR (ORCPT ); Tue, 23 Aug 2016 13:52:17 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u7NHjErb006991 for ; Tue, 23 Aug 2016 10:52:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=sIIgsJnGEiU/wL+sWA13vCYgaLwYbldwQv2xJ2joZxA=; b=DVYW0d3fPw1T6AXRm6p6bR0krW1Ny2CkonWvBYvQCevNMlsUo20gtY+eFKj+4plzfMNV dJCunyVF4GbIuhF2nTjGxxs/lMykbGvn55B9nsKsefp6G67IaKovgTNstt3n7avJKgxm 3tYCcMsMoHzghj0pAslJqr3YabjPKpNDaeU= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 250tnw0f3t-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 23 Aug 2016 10:52:17 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.25) with Microsoft SMTP Server (TLS) id 14.3.294.0; Tue, 23 Aug 2016 13:52:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mhtyKVJ4tb15ohLQ3z0s2k6Jzr0Tehdi84N2HjmdzEE=; b=dmc3RfB3WrHzHuD7FEdi/ZPLs/PbsgeM6yXMKO3tvLb2aFP8eqvttYLS+thMlgAcctK6MFUGr3COEGPP0uluAfAY7/vDagedX3xC3mgk9Xn/W6UEDqXsI+RlfeJ5VWNjprcLlXqqzcaQH8BcO64/4zxYpkKBx9PjOtoNxTzJoTw= Received: from localhost (107.15.72.49) by CY4PR15MB1320.namprd15.prod.outlook.com (10.172.182.8) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.557.21; Tue, 23 Aug 2016 17:52:12 +0000 From: Josef Bacik To: Subject: [PATCH] btrfs/131: send test for rename+recycled ino Date: Tue, 23 Aug 2016 13:51:58 -0400 Message-ID: <1471974718-1430-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [107.15.72.49] X-ClientProxiedBy: BN6PR12CA0011.namprd12.prod.outlook.com (10.168.222.21) To CY4PR15MB1320.namprd15.prod.outlook.com (10.172.182.8) X-MS-Office365-Filtering-Correlation-Id: fa25335c-c313-44f7-eb25-08d3cb7e367c X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 2:vsIQYZbvJO/cCBt7TDq6seTtg1VV7s62IJs/n3Dth094SCIwjJfm/OESn5eZK4/iSNBEhYbuX3TcPqc3FA6v+w20aryl/2mfd3DDyCV533D7uOiE6tlqYlp4EO6DEPKb2y6A5CPMFTeclnfB7RcO16g3Tb+9PHtDn663jQLsa7/0MaWpak2dpHwacyxl9BDk; 3:MDInFHefyAdf6CBn6tcBzux6im1eAJTbV8UHe/qoS1eURxSfdQ2ZDCJG5U9Q+tBR4rWnJ4uV6aEGFR3zDT4XqLCTHUCWRoCnHuvOh7VJSCMyxy04AVwxQ/4MREyKaMDS; 25:Tk2o7Y4/oktAbUkQB3/fKIif58VdAEaz+w1mpJWZ9zddL3pRuCYRopeubeqnOO18+YOa8+eqQZ22yyJMYAVXoCjtI0GnDPgLm5r1SvbqKQrhsK8efbFaL6yEsqaF3Op/o7S64E+694sxRR7E4UgErkzBnmxr6JeXP/uqZVb+LBlTjjh8Fhh+0Uqhm9Ojc12HDokHBzx0BH69niF5qy3pER51i/1UXDPMkU939/jjIJQbR3J8p3gNuHiDd1E9pRlYdgx71Mziv+IOTO76o/E/SctsFJHGpRMvDUJqcrhUz/Lc4syUJYSUVodxFJoG7SpEfQkxzds8o83PcjuN0gFDE2T31/XBEdJI5VvT4hh5caLUXWB3sxKvP+4yh3f9Vd9z2hjX5sF6wi94IqID+2zwfgEgxsMRtJmjtHyOpBp3Fus= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR15MB1320; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 31:aXnN3MFKH8mOQNzHyZbjS1KbvvaCjgCQgHoPefWIICVygyw/+Hg54POdopJHVLp+ysQShNskm7Mju4bHvTnjFEB3aFRzCBEvps1JLrY0BXGF/J9FKUYkic0/AUBXWLH2s3AUWrt9M87LuqnABbkwjpcZ1gChTYlbpfQvayU/9kX1L1oxyLHDvo+umblRyOUsaM+iT1hYX+0uVCZ0CpWGXOSw738aBV57hp8MZcxjIBg=; 20:xAERYHGZeZVJd8EpmQyVzJL8sUYrbVrUla3FgtSKh9bJYUZjXp9qjN4VQzip1Ppr6N28bD9DmCBwy43hKCkhNu5ymR1P6cUxZLMKcPRthfwfU7HR2hXnBvURCv0vW4o5JKNIoFRGRN2NVZMCcs9KJlX4dolK3MIV5oAaji3/KeM=; 4:dClbYwcJ9iyXbR6WyKK4Z6EQsoTPqItD/hkQckeT2l3vmlFAPOnbW+Q7U4h9wvwPCP4eB7d8ngPlUbOtrzI/3RbVFa14RAJFWj8qFu4BhyM9eW57LzmwHz88EYr8mHVuklUyhQ+ZOWdRl412F4j+oStzC3eTr1TxgtGKESk+qJRPpDBBPIi7A2p8iAmXU9uqgT2pkRoem1ce2swAmkmVr5jQN+BTzRLgafBGio4SKgbRY7CDyn3WAnk/fCkiwTNXzu5GGOdUgYchKPtJjl6xtcpqjfNxrs5MFYQClLq1ip8tcPfRPNhyTfnfVB4ABBg9a+0JAMynSnY06OF4gorNApSsVbnxFHkLBnPX3sTgPr/VFmUtq904ZDSIChdja6RiGVu6Aclzabm4sfRssTKRD8MgViRuDDqhXinZ0+BNjdWlXL1SK40lVkDaMJKAV1gN X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:CY4PR15MB1320; BCL:0; PCL:0; RULEID:; SRVR:CY4PR15MB1320; X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(52294002)(199003)(189998001)(3846002)(77096005)(8676002)(81166006)(81156014)(6116002)(48376002)(36756003)(86362001)(105586002)(586003)(66066001)(92566002)(76506005)(47776003)(68736007)(7736002)(7846002)(305945005)(5660300001)(5003940100001)(19580395003)(101416001)(106356001)(19580405001)(2351001)(107886002)(97736004)(2906002)(229853001)(110136002)(42186005)(33646002)(50466002)(50986999)(450100001)(50226002)(2004002)(4720700001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR15MB1320; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1320; 23:JihCi0slEJ/h76ADT0RZGOpQeNK/noUvJRTPZO0zU?= =?us-ascii?Q?ba0RFl2yCgq/pbrVL5SJ8GQRqvS4SZxjfBdZ1nzZ26pqCIjMV3iAMdBrguQa?= =?us-ascii?Q?UCrIoE0ZWN9rpWPS2CueBa29NpPbHUo/nP3UYL4didLLeVvkc7qM0wPVvr7M?= =?us-ascii?Q?yJKynUvQ2pKxbo4QZF0l3BWWqwJws6nU1lULr41vUdu/0krhyqGnfo062TRU?= =?us-ascii?Q?Z/vbGLgVuaceUuLJyVBSu8onLFuKZD3WaVMXgQ+3fq8zk4rxhY1o8z5CGQW/?= =?us-ascii?Q?Sv7uOmh9uM6i6Zix6iIkZYQGOCNBGQFB8Co/rN6s+INHkP6eVWSyWHYiU/+q?= =?us-ascii?Q?o5K9zbHt8rT0ZZvAx5V7V62WsdW/ggSjeLKqaegU3YRAIv46DOB1ZjOe5ewf?= =?us-ascii?Q?05F3voQlwJO6ts/7S4r+4F//iIU87r4qgfC4W2PqpYAbW9tG/7izbKGyy/Oy?= =?us-ascii?Q?bNt4w18VFfsJuf9Z2BzLQbqG2bemTvCUZjm2pSTlLDJkJj1OEKDOQfvJFj1W?= =?us-ascii?Q?SYN3FcpsDm/PSrBrxEGTVEgx0NIhd3OxKqgy8zfSoxGJZ1F+CIV8olOQIjfU?= =?us-ascii?Q?FWxrKTSUvVxxzy3LqlJlYRdkEjzx8PSnCYSD+IlaVK8t/cSidc1o4ne3h0/+?= =?us-ascii?Q?cRcRUcS2JkOj115jz/1g9qVRfpYZ2x2eX/b+IRWhanuOw1avk1pAw+aXjAl+?= =?us-ascii?Q?6XqkqXdN++YHlEHFFsMWQRJHUJWZgQpi5Iii/7VsEt+dWYAqtqvu8I1DQVTu?= =?us-ascii?Q?HQQiKb83ObDjK5EAXGi79Sf1031aHjQf53QVdMxIN3UGP3fHiWuM6w0P/e3h?= =?us-ascii?Q?PVznwzPYZwnTppkb5mAHT1e9/t6J7c6uMV9F+qKCrqRhP/s7AU3fD0UKm5eJ?= =?us-ascii?Q?xcv8iDPt2+qNlQTuGmIzG/OKKjj9Bp1Duc5jBNZ9a3E4Cf2FWm1bchXtwbfw?= =?us-ascii?Q?XieEyHzVYFZKdOf+7T69SOw7VOTpOhU7Kv3CShqzhMn/5L0UTE/uRn7az5MP?= =?us-ascii?Q?D/O8oYZVY0JIsPi5KkWL+suoXGRXTx4RAF4p8HjdNPAb6K2QLyc8W/Tpq/bx?= =?us-ascii?Q?83oVd13VR0hQmOx/sBgjQBLkIxc1Srnb59WnqGz5oEJCSxcYOiK5+cNg5CXK?= =?us-ascii?Q?a/OwJ6CxtkIfN33FGXOpMv2il2Mz1JN7U6x7eHbAucpWrA6gmh9b4wnskb59?= =?us-ascii?Q?zNOsq/hZoj7EcE=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 6:5rNWCJQ5CRrOBGNuhivqsBLwFWWP688s4f3rYaU2vlV93ImbsYDcfZP45i/F2XBVbitl1RcOsjA+wBlK8thsmFDCbz8UEvLyns7NAGPeL3atZxnVKM9s4IU68RVnEGN92x87BLla6xHhq8R044JfNeGn432+vfq57jTaNubMIp3yOS7b9b47B/x2xtmrIHuNAKMDnAWVjD4R6bAupJc+75O5dGLgRTpr8tGTCyxVNoo3CQ6ZRQdLKkMHbFeYOJAVnfAo9INiPa3UNEyGNN7Y9enby+0yOjtw9RBjvSM0Njo=; 5:r0kiNL0Shw5CxTC9sXM83HFRBOdCH2VM9XIn7kQ+K8RlOdx0Qfj/AcREEcfug2BFVLnoBAMSCirl1yW/Asui9pyczDUbVF5xYygE8H8I0+NLn6oh/y7xYZCdCzQ7Vp8cyeo0uIBULtGr1IDuusYKFA==; 24:/1USqXEwwtBG8j+/ImKOYHiJfacH5Xu9zmq9F9jPPt6o9mYbod0DCooaXioNq0x2nCWqZjL0CqcvUdYaK/xU6P1/EmU7MvWucR5OKe0PX4I=; 7:Tab8/k+Xo1gC+J0dmcsbtFcvBX83Ffi4kXZ8t37uDJk/XpxcILBe3krmOb+O/Fa05U/Y8CLSHOgjaZ46zNmktV4LUMKqcdZT+l1flYaf9go1oiz78XwMefqHcpRSPDPVQBIHVOGbmZbtIBtzee3Ghtgb27Tv54Jjmkv4zI7yqVUJpjNr9U0i5IdzQKevv4k/9e80YY+nCz3sgOtsys1VOwVVBv2/+YU4R/nsGi/YAQZqm8EiqbfhXCdwq7hGFvsi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1320; 20:McR0vGScBXdgUwwyK7iE5SxEsLT2MtvX9PD2MH973HNFSmwFI4N2DGbIjzYwZ6yLk5e613iptrX2XskmPOWP0QN2/GKgK7tWAjojXB3VKkVtuLdsiOWg/p1GnhDkD630GRNEx1+og2KrrUVaiWxooTj9ucXBMB/M4M1aZalHTvY= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 17:52:12.7874 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1320 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-23_10:, , signatures=0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a test for a problem I hit with send/receive. If you mount with -o inode_cache it is possible to recycle inode numbers, and btrfs assumes that when you have a recycled inode number that it's parent directory won't be needing a rename, but this is not the case. Without the patch to fix this problem this test will panic the box if ASSERT() is turned on, otherwise it'll simply fail the fssum. Signed-off-by: Josef Bacik --- tests/btrfs/131 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/131.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 94 insertions(+) create mode 100644 tests/btrfs/131 create mode 100644 tests/btrfs/131.out diff --git a/tests/btrfs/131 b/tests/btrfs/131 new file mode 100644 index 0000000..596adc1 --- /dev/null +++ b/tests/btrfs/131 @@ -0,0 +1,91 @@ +#! /bin/bash +# FS QA Test 131 +# +# Make sure btrfs handles send/receive of a file that has been destroyed and +# recreated with a recycled inode number and a renamed parent directory. This +# is a test for a fix based on the patch +# +# Btrfs: handle pending renames with recycled inodes properly +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Facebook. All Rights Reserved. +# +# 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" + +here=`pwd` +tmp=`mktemp -d` +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + rm -fr $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 + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_fssum + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount "-o inode_cache" + +_run_btrfs_util_prog subvolume create $SCRATCH_MNT/base +mkdir $SCRATCH_MNT/base/b +mkdir $SCRATCH_MNT/base/a +mv $SCRATCH_MNT/base/b $SCRATCH_MNT/base/a + +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/base \ + $SCRATCH_MNT/snap1 +_run_btrfs_util_prog send $SCRATCH_MNT/snap1 -f $tmp/1.snap + +mv $SCRATCH_MNT/base/a $SCRATCH_MNT/base/c +rmdir $SCRATCH_MNT/base/c/b + +# We need to sync to make sure the inode number is recycled +sync +mkdir $SCRATCH_MNT/base/c/b + +_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/base $SCRATCH_MNT/snap2 +run_check $FSSUM_PROG -A -f -w $tmp/fssum $SCRATCH_MNT/snap2 + +_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2 -f $tmp/2.snap + +_scratch_unmount +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/1.snap +_run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap +run_check $FSSUM_PROG -r $tmp/fssum $SCRATCH_MNT/snap2 + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/131.out b/tests/btrfs/131.out new file mode 100644 index 0000000..d118ca9 --- /dev/null +++ b/tests/btrfs/131.out @@ -0,0 +1,2 @@ +QA output created by 131 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 6b29c05..933fe10 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -133,3 +133,4 @@ 128 auto quick send 129 auto quick send 130 auto clone send +131 auto quick send