From patchwork Wed Aug 21 16:03:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 2847845 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 3BDF5BF546 for ; Wed, 21 Aug 2013 16:03:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D46D205CD for ; Wed, 21 Aug 2013 16:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FA20205CC for ; Wed, 21 Aug 2013 16:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878Ab3HUQDj (ORCPT ); Wed, 21 Aug 2013 12:03:39 -0400 Received: from dkim2.fusionio.com ([66.114.96.54]:42433 "EHLO dkim2.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696Ab3HUQDi (ORCPT ); Wed, 21 Aug 2013 12:03:38 -0400 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim2.fusionio.com (Postfix) with ESMTP id CFC5B9A06AB for ; Wed, 21 Aug 2013 10:03:37 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1377101017; bh=0hs78mr6YY4Dxx1KjVCXIsQtDi7DnSJi0NvslwmQI04=; h=From:To:Subject:Date; b=EDxAaUH6fAsBSOxzbOCiegTmIjYZIFuqLYrle0f+xhJQkJysjqGS/LB160Bsi5BM4 MRbe0ukNCPg4cbHI44nrTqGAU0LGhcS6s68NsSKjajaeMVotJS98tgx1phKYj2Y2i2 kujSchBYN2xmgwtVT8P3O9ZjLkH9j/Hejx9hSPtM= X-ASG-Debug-ID: 1377101017-0421b502212bdf40001-6jHSXT Received: from CAS2.int.fusionio.com (cas2.int.fusionio.com [10.101.1.41]) by mx2.fusionio.com with ESMTP id CdMAxCQ2V1oaEGEk (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Wed, 21 Aug 2013 10:03:37 -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.123.3; Wed, 21 Aug 2013 10:03:36 -0600 From: Josef Bacik To: , Subject: [PATCH] xfstests: btrfs/003: stat the dev we're removing to make sure its' really gone Date: Wed, 21 Aug 2013 12:03:35 -0400 X-ASG-Orig-Subj: [PATCH] xfstests: btrfs/003: stat the dev we're removing to make sure its' really gone Message-ID: <1377101015-3070-1-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.7.7.6 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: 1377101017 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-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.139016 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=-9.6 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 --- tests/btrfs/003 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tests/btrfs/003 b/tests/btrfs/003 index 5c88651..dba1a32 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -145,6 +145,12 @@ _test_replace() _devmgt_remove ${DEVHTL} dev_removed=1 + stat $ds >> $seqres.full 2>&1 + while [ $? -eq 0 ]; do + sleep 1 + stat $ds >> $seqres.full 2>&1 + done + $BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \ "btrfs did not report device missing"