From patchwork Fri Oct 18 18:26:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 3069481 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C815CBF924 for ; Fri, 18 Oct 2013 18:26:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FDEC203B4 for ; Fri, 18 Oct 2013 18:26:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 912DD2039F for ; Fri, 18 Oct 2013 18:26:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756946Ab3JRS0j (ORCPT ); Fri, 18 Oct 2013 14:26:39 -0400 Received: from dkim1.fusionio.com ([66.114.96.53]:38363 "EHLO dkim1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756575Ab3JRS0h (ORCPT ); Fri, 18 Oct 2013 14:26:37 -0400 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim1.fusionio.com (Postfix) with ESMTP id B5B477C0427 for ; Fri, 18 Oct 2013 12:26:36 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1382120796; bh=gJKdNq8hgF6OXpKujI+ocJUmrdZUqZf7MebhNjXeir8=; h=From:To:Subject:Date:In-Reply-To:References; b=FJcaYNVsz7aSfJN29wF/fXpdylm/Jg5s+YeEWysHkinYSuFloxkLRqOb9RHhSqMXF nJTh3aH8cAeCnYlx2/J7vQElZfxP8jqIf9dh8LnT55djXgCT3GcsS8i19kF+tguNFU vCYYGX0GeeUCuZ6BaZwuIDFO+AXWSzcujK5zte1c= X-ASG-Debug-ID: 1382120796-0421b56d4338500001-6jHSXT Received: from CAS2.int.fusionio.com (cas2.int.fusionio.com [10.101.1.41]) by mx2.fusionio.com with ESMTP id lJYN17w3UGksPmQD (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Fri, 18 Oct 2013 12:26:36 -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; Fri, 18 Oct 2013 12:26:35 -0600 From: Josef Bacik To: , Subject: [PATCH 3/8] xfstests: stat the dev we're removing to make sure its' really gone V2 Date: Fri, 18 Oct 2013 14:26:25 -0400 X-ASG-Orig-Subj: [PATCH 3/8] xfstests: stat the dev we're removing to make sure its' really gone V2 Message-ID: <1382120790-31060-3-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> References: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> 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: 1382120796 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.141573 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 --- V1->V2: Take Eric's suggestion to do this in the helper function common/rc | 9 +++++++++ tests/btrfs/003 | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b253948..253bd05 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() { + local h=$1 + local disk=$2 + echo 1 > /sys/class/scsi_device/${1}/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 \