From owner-svn-src-all@freebsd.org Tue Nov 22 11:46:23 2016 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 E9B60C4FCA2; Tue, 22 Nov 2016 11:46:23 +0000 (UTC) (envelope-from avg@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 mx1.freebsd.org (Postfix) with ESMTPS id A1E96ACD; Tue, 22 Nov 2016 11:46:23 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMBkMgt012231; Tue, 22 Nov 2016 11:46:22 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMBkM47012230; Tue, 22 Nov 2016 11:46:22 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201611221146.uAMBkM47012230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 22 Nov 2016 11:46:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r308986 - vendor/illumos/dist/lib/libzfs/common X-SVN-Group: vendor 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.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, 22 Nov 2016 11:46:24 -0000 Author: avg Date: Tue Nov 22 11:46:22 2016 New Revision: 308986 URL: https://svnweb.freebsd.org/changeset/base/308986 Log: 6412 zfs receive: -u can be ignored sometimes illumos/illumos-gate@9185393f2919d8b897f6142d8a9fa0429c285dc1 https://github.com/illumos/illumos-gate/commit/9185393f2919d8b897f6142d8a9fa0429c285dc1 https://www.illumos.org/issues/6412 It seems that zfs receive -F -u would mount a received filesystem after receiving a full stream if a destination filesystem already existed (and, thus, got destroyed and re-created) and was mounted. How to reproduce: $ zfs create rpool/sandbox $ zfs create rpool/sandbox/from $ zfs create rpool/sandbox/to $ zfs snap rpool/sandbox/from@snap $ zfs send rpool/sandbox/from@snap | zfs recv -v -F -u rpool/sandbox/to receiving full stream of rpool/sandbox/from@snap into rpool/sandbox/to@snap received 41.7KB stream in 1 seconds (41.7KB/sec) $ zfs get mounted rpool/sandbox/to NAME PROPERTY VALUE SOURCE rpool/tmp/sandbox/to mounted yes - This behavior can be problematic if the mountpoint property changes either because it had a non-inherited value or the stream contains properties because it has been generated with either -R or -p. Reviewed by: Matthew Ahrens Reviewed by: Paul Dagnelie Approved by: Richard Lowe Author: Andriy Gapon Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Tue Nov 22 11:44:30 2016 (r308985) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Tue Nov 22 11:46:22 2016 (r308986) @@ -3533,7 +3533,8 @@ zfs_receive_one(libzfs_handle_t *hdl, in } if (clp) { - err |= changelist_postfix(clp); + if (!flags->nomount) + err |= changelist_postfix(clp); changelist_free(clp); }