From patchwork Mon Oct 21 16:13:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3078791 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 99F1A9F2B8 for ; Mon, 21 Oct 2013 16:14:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7288420218 for ; Mon, 21 Oct 2013 16:14:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3914320353 for ; Mon, 21 Oct 2013 16:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750986Ab3JUQN4 (ORCPT ); Mon, 21 Oct 2013 12:13:56 -0400 Received: from dkim1.fusionio.com ([66.114.96.53]:59252 "EHLO dkim1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750809Ab3JUQNz (ORCPT ); Mon, 21 Oct 2013 12:13:55 -0400 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim1.fusionio.com (Postfix) with ESMTP id 618537C0692 for ; Mon, 21 Oct 2013 10:13:55 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1382372035; bh=SyDe1oyWg6BS/jb+/ylC432cthUcJJCgLprE65eWKXM=; h=From:To:Subject:Date; b=VZ15hBzsoP3RhNlvIRrxxFZ5FoN77XUs9U8muXCTq5/03F5DQjyAK0nO5hsauhPRe nu0HtzpgcTXigHG0uRENIa1X5RQGxXWFusfxFiupXcFyahUhaIsLhCtSWviYhZXIxL jv+6g/+4Kqd1x4MaEspS6DqyOrhSgUxBccWyxlnk= X-ASG-Debug-ID: 1382372034-0421b56d454bb70001-6jHSXT Received: from CAS2.int.fusionio.com (cas2.int.fusionio.com [10.101.1.41]) by mx2.fusionio.com with ESMTP id VF3KbbOLnY07nP0C (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Mon, 21 Oct 2013 10:13:54 -0600 (MDT) X-Barracuda-Envelope-From: JBacik@fusionio.com Received: from localhost (10.101.1.160) by mail.fusionio.com (10.101.1.41) with Microsoft SMTP Server (TLS) id 14.3.158.1; Mon, 21 Oct 2013 10:13:54 -0600 From: Josef Bacik To: , , Subject: [PATCH] xfstests: stat the dev we're removing to make sure its' really gone V3 Date: Mon, 21 Oct 2013 12:13:53 -0400 X-ASG-Orig-Subj: [PATCH] xfstests: stat the dev we're removing to make sure its' really gone V3 Message-ID: <1382372033-2742-1-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.101.1.160] X-Barracuda-Connect: cas2.int.fusionio.com[10.101.1.41] X-Barracuda-Start-Time: 1382372034 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.181:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.141671 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I've been periodically failing btrfs/003 because my box sometimes takes a little longer to unregister the device when we remove it and so the output from btrfs dev show doesn't match what we are wanting since it still sees the device. To fix this just stat and sleep if we still see the device node and only continue once udev or whatever actually removes the device node so that we don't get random failures. Thanks, Signed-off-by: Josef Bacik Reviewed-by: Eric Sandeen --- V2->V3: actually use the lun local variable. common/rc | 11 ++++++++++- tests/btrfs/003 | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index b253948..b5eb582 100644 --- a/common/rc +++ b/common/rc @@ -2093,7 +2093,16 @@ _require_freeze() # ls -l /sys/class/block/sdd | rev | cut -d "/" -f 3 | rev _devmgt_remove() { - echo 1 > /sys/class/scsi_device/${1}/device/delete || _fail "Remove disk failed" + local lun=$1 + local disk=$2 + + echo 1 > /sys/class/scsi_device/${lun}/device/delete || _fail "Remove disk failed" + + stat $disk > /dev/null 2>&1 + while [ $? -eq 0 ]; do + sleep 1 + stat $disk > /dev/null 2>&1 + done } # arg 1 is dev to add and is output of the below eg. diff --git a/tests/btrfs/003 b/tests/btrfs/003 index 262b1d5..15c2cc7 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -142,7 +142,7 @@ _test_replace() DEVHTL=`ls -l /sys/class/block/${d} | rev | cut -d "/" -f 3 | rev` #fail disk - _devmgt_remove ${DEVHTL} + _devmgt_remove ${DEVHTL} $ds dev_removed=1 $BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \