From owner-svn-src-all@freebsd.org  Mon Oct  7 18:55:41 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 249DD136C18;
 Mon,  7 Oct 2019 18:55:41 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46n8nT08DFz4QZK;
 Mon,  7 Oct 2019 18:55:41 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDCD71AFB5;
 Mon,  7 Oct 2019 18:55:40 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x97ItefG033828;
 Mon, 7 Oct 2019 18:55:40 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x97Iten2033827;
 Mon, 7 Oct 2019 18:55:40 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201910071855.x97Iten2033827@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Mon, 7 Oct 2019 18:55:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353282 - head/tests/sys/cddl/zfs/tests/slog
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/slog
X-SVN-Commit-Revision: 353282
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Oct 2019 18:55:41 -0000

Author: asomers
Date: Mon Oct  7 18:55:40 2019
New Revision: 353282
URL: https://svnweb.freebsd.org/changeset/base/353282

Log:
  zfs: fix the slog_012_neg test
  
  This test attempts to corrupt a file-backed vdev by deleting it and then
  recreating it with truncate.  But that doesn't work, because the pool
  already has the vdev open, and it happily hangs on to the open-but-deleted
  file.  Fix by truncating the file without deleting it.
  
  MFC after:	2 weeks
  Sponsored by:	Axcient

Modified:
  head/tests/sys/cddl/zfs/tests/slog/slog_012_neg.ksh

Modified: head/tests/sys/cddl/zfs/tests/slog/slog_012_neg.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/slog/slog_012_neg.ksh	Mon Oct  7 18:21:33 2019	(r353281)
+++ head/tests/sys/cddl/zfs/tests/slog/slog_012_neg.ksh	Mon Oct  7 18:55:40 2019	(r353282)
@@ -74,7 +74,9 @@ function test_slog_mirror_corruption # <pooltype> <spa
 	log_must $DD if=/dev/urandom of=$mntpnt/testfile.${TESTCASE_ID} count=100
 
 	ldev=$(random_get $LDEV)
-	log_must create_vdevs $ldev
+	eval `$STAT -s $ldev`
+	log_must $TRUNCATE -s0 $ldev
+	log_must $TRUNCATE -s $st_size $ldev
 	log_must $ZPOOL scrub $TESTPOOL
 
 	log_must display_status $TESTPOOL