From owner-svn-src-all@freebsd.org Tue Jan 31 15:10:43 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB15ACCA2EB; Tue, 31 Jan 2017 15:10:43 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-yb0-x243.google.com (mail-yb0-x243.google.com [IPv6:2607:f8b0:4002:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 780E81DD1; Tue, 31 Jan 2017 15:10:43 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-yb0-x243.google.com with SMTP id o65so4726185ybo.3; Tue, 31 Jan 2017 07:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=2HyIpJzFgnNuNAr2fZ6q6tUeAYdtFKoC0YOkSbyQfv4=; b=oR9eZDcCEWd+5kuTTrFNBraZl+tg5CPQqUDL4MSlMZvEOZwIjJO4wF0xzgCLKQ5nnF LmfL1qaRqvx+WRkqNZBV4KnbSonH1oMLj4nrjXYebcbmVxw0o4xhif0WOzdQWYzlIMTw 5mmlnhY76FPCSQyhtvAA97dGKZanYn0IdoBLWCSfJNG0se0+meGLBO5r0L8ETJkBg5lz TfyP4+VEfuMmX5Skdw5AolOoD3eZo8HH6Fz6TiIFVgtqEUjAPJYt/vLi0CrWPztJJOYm PaeYEB/PIRX7TeQJQkrao9eoE/lgd4l4g3YZSjxjpnOnOOhi28qviDCSidmde9YPVOVr N+uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=2HyIpJzFgnNuNAr2fZ6q6tUeAYdtFKoC0YOkSbyQfv4=; b=MUnr/LLykCnfmEaQlCYJHe+wzHWgHGB3jUmufIu9dK5+ORoKUF3Z2awvVmE+K1lWDk phBxmtXmleislCJgZ23V6y9gf4WEWzVEBJJpoezpHdw2Z2qiEkq/xwsP3yuHve384CAM ApCJV8atoNUH5Izcz/HeFE47fWJF8RegI3Px7O0Q2TyBbrk+lyDoHRgKsKj0ygSiTUgA PqIjPlzKPizJvr/yaf31RjU1xo0u26yRcIJdtW40JBZEV1BiC0oFe409YzFaxIzvOlNN dsRfbwacvClZU4+2iqItBQol4ur8pks3IRSS6d3ibDMogIYXSttLu1Ju74HxJI2EYEF4 vA5Q== X-Gm-Message-State: AIkVDXK2myjztSewA3VfuQdijjWfe+PHuSdE51LOYo0MaUZccUQd8m+wxt3RH4NNvraTpoJksL6PJVOo9cEzZQ== X-Received: by 10.37.105.76 with SMTP id e73mr14051796ybc.113.1485875442424; Tue, 31 Jan 2017 07:10:42 -0800 (PST) MIME-Version: 1.0 Sender: asomers@gmail.com Received: by 10.129.38.133 with HTTP; Tue, 31 Jan 2017 07:10:41 -0800 (PST) In-Reply-To: <201701310612.v0V6CqVL093451@repo.freebsd.org> References: <201701310612.v0V6CqVL093451@repo.freebsd.org> From: Alan Somers Date: Tue, 31 Jan 2017 08:10:41 -0700 X-Google-Sender-Auth: myT_ltXr67cUqusPQLeubDQP87w Message-ID: Subject: Re: svn commit: r313008 - head/tests/sys/geom/class/gate To: Ngie Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2017 15:10:43 -0000 I think wait_for_ggate_device should also be used at line 32, which calls "ggatec create". -Alan On Mon, Jan 30, 2017 at 11:12 PM, Ngie Cooper wrote: > Author: ngie > Date: Tue Jan 31 06:12:51 2017 > New Revision: 313008 > URL: https://svnweb.freebsd.org/changeset/base/313008 > > Log: > Wait for /dev/ggate* to appear after calling `ggatel create` in :ggatel_{file,md} > > The test assumed that `ggatel create` created a device on completion, but that's > incorrect. This squashes the race by waiting for the device to appear, as > `ggatel create` daemonizes before issuing an ioctl to geom_gate(4) if not called > with `-v`. > > Discussed with: asomers > MFC after: 1 week > PR: 204616 > Sponsored by: Dell EMC Isilon > > Modified: > head/tests/sys/geom/class/gate/ggate_test.sh > > Modified: head/tests/sys/geom/class/gate/ggate_test.sh > ============================================================================== > --- head/tests/sys/geom/class/gate/ggate_test.sh Tue Jan 31 03:40:13 2017 (r313007) > +++ head/tests/sys/geom/class/gate/ggate_test.sh Tue Jan 31 06:12:51 2017 (r313008) > @@ -74,7 +74,11 @@ ggatel_file_body() > > atf_check ggatel create -u $us work > > - dd if=src of=/dev/ggate${us} bs=1m count=1 conv=notrunc > + ggate_dev=/dev/ggate${us} > + > + wait_for_ggate_device ${ggate_dev} > + > + dd if=src of=${ggate_dev} bs=1m count=1 conv=notrunc > > checksum src work > } > @@ -104,7 +108,11 @@ ggatel_md_body() > > atf_check ggatel create -u $us /dev/$work > > - dd if=/dev/$src of=/dev/ggate${us} bs=1m count=1 conv=notrunc > + ggate_dev=/dev/ggate${us} > + > + wait_for_ggate_device ${ggate_dev} > + > + dd if=/dev/$src of=${ggate_dev} bs=1m count=1 conv=notrunc > > checksum /dev/$src /dev/$work > } > @@ -191,3 +199,14 @@ common_cleanup() > fi > true > } > + > +# Bug 204616: ggatel(8) creates /dev/ggate* asynchronously if `ggatel create` > +# isn't called with `-v`. > +wait_for_ggate_device() > +{ > + ggate_device=$1 > + > + while [ ! -c $ggate_device ]; do > + sleep 0.5 > + done > +} >