From owner-svn-src-user@freebsd.org Sun Mar 8 06:06:21 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 7E61625FAB5
for <svn-src-user@mailman.nyi.freebsd.org>;
Sun, 8 Mar 2020 06:06:21 +0000 (UTC) (envelope-from pho@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 48ZrT91H2Zz4V86;
Sun, 8 Mar 2020 06:06:21 +0000 (UTC) (envelope-from pho@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 273E21D6DF;
Sun, 8 Mar 2020 06:06:21 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02866L6F060086;
Sun, 8 Mar 2020 06:06:21 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02866LI8060085;
Sun, 8 Mar 2020 06:06:21 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <202003080606.02866LI8060085@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 8 Mar 2020 06:06:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358735 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 358735
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2020 06:06:21 -0000
Author: pho
Date: Sun Mar 8 06:06:20 2020
New Revision: 358735
URL: https://svnweb.freebsd.org/changeset/base/358735
Log:
This tests would sometimes run for more than an hour. Fix that.
Modified:
user/pho/stress2/misc/zfs4.sh
Modified: user/pho/stress2/misc/zfs4.sh
==============================================================================
--- user/pho/stress2/misc/zfs4.sh Sun Mar 8 00:23:36 2020 (r358734)
+++ user/pho/stress2/misc/zfs4.sh Sun Mar 8 06:06:20 2020 (r358735)
@@ -62,6 +62,7 @@ zfs set snapdir=visible stress2_tank/test
export RUNDIR=/stress2_tank/test/stressX
export runRUNTIME=10m
+start=`date +%s`
(cd ..; ./run.sh marcus.cfg) &
for i in `jot 20`; do
@@ -70,9 +71,17 @@ done
for i in `jot 20`; do
zfs destroy stress2_tank/test@snap$i
done
+while pgrep -fq run.sh; do
+ [ $((`date +%s` - start)) -gt 660 ] &&
+ ../tools/killall.sh
+ sleep 10
+done
wait
-zfs destroy -r stress2_tank
+for i in `jot 3`; do
+ zfs destroy -r stress2_tank && break
+ sleep 10
+done
zpool destroy stress2_tank
mdconfig -d -u $u1
From owner-svn-src-user@freebsd.org Sun Mar 8 06:07:52 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 EB71625FAE4
for <svn-src-user@mailman.nyi.freebsd.org>;
Sun, 8 Mar 2020 06:07:52 +0000 (UTC) (envelope-from pho@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 48ZrVw2N9fz4Wyq;
Sun, 8 Mar 2020 06:07:52 +0000 (UTC) (envelope-from pho@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 209AE1D6E0;
Sun, 8 Mar 2020 06:07:52 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02867qcu060199;
Sun, 8 Mar 2020 06:07:52 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02867ps2060198;
Sun, 8 Mar 2020 06:07:51 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <202003080607.02867ps2060198@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 8 Mar 2020 06:07:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358736 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 358736
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2020 06:07:53 -0000
Author: pho
Date: Sun Mar 8 06:07:51 2020
New Revision: 358736
URL: https://svnweb.freebsd.org/changeset/base/358736
Log:
Mark all sctp tests as "no run" again.
Modified:
user/pho/stress2/misc/all.sh
Modified: user/pho/stress2/misc/all.sh
==============================================================================
--- user/pho/stress2/misc/all.sh Sun Mar 8 06:06:20 2020 (r358735)
+++ user/pho/stress2/misc/all.sh Sun Mar 8 06:07:51 2020 (r358736)
@@ -86,6 +86,8 @@
# quota7.sh panic: dqflush: stray dquot 20120221
# rename14.sh WiP 20200215
# rename15.sh WiP 20200215
+# sctp.sh WiP 20200307
+# sctp2.sh panic: soclose: SS_NOFDREF on enter 20200307
# sctp3.sh WiP 20190809
# signal.sh Timing issues. Needs fixing 20171116
# snap4.sh panic: snapacct_ufs2: bad block 20181014
From owner-svn-src-user@freebsd.org Sun Mar 8 06:09:47 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 41C8A25FB1C
for <svn-src-user@mailman.nyi.freebsd.org>;
Sun, 8 Mar 2020 06:09:47 +0000 (UTC) (envelope-from pho@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 48ZrY70GKnz4cRN;
Sun, 8 Mar 2020 06:09:47 +0000 (UTC) (envelope-from pho@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 D9A381D6E1;
Sun, 8 Mar 2020 06:09:46 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02869k04060322;
Sun, 8 Mar 2020 06:09:46 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02869kNs060321;
Sun, 8 Mar 2020 06:09:46 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <202003080609.02869kNs060321@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 8 Mar 2020 06:09:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358737 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 358737
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2020 06:09:47 -0000
Author: pho
Date: Sun Mar 8 06:09:46 2020
New Revision: 358737
URL: https://svnweb.freebsd.org/changeset/base/358737
Log:
Added comment about problem found.
Modified:
user/pho/stress2/misc/sctp2.sh
Modified: user/pho/stress2/misc/sctp2.sh
==============================================================================
--- user/pho/stress2/misc/sctp2.sh Sun Mar 8 06:07:51 2020 (r358736)
+++ user/pho/stress2/misc/sctp2.sh Sun Mar 8 06:09:46 2020 (r358737)
@@ -15,6 +15,9 @@
# "panic: Don't own TCB lock" seen:
# https://people.freebsd.org/~pho/stress/log/sctp2.txt
+# "panic: soclose: SS_NOFDREF on enter" seen:
+# https://people.freebsd.org/~pho/stress/log/sctp2-2.txt
+
# $FreeBSD$
cat > /tmp/sctp2.c <<EOF
From owner-svn-src-user@freebsd.org Wed Mar 11 19:59:31 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 A023D269031
for <svn-src-user@mailman.nyi.freebsd.org>;
Wed, 11 Mar 2020 19:59:31 +0000 (UTC) (envelope-from gjb@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 48d2q71S20z3NBq;
Wed, 11 Mar 2020 19:59:31 +0000 (UTC) (envelope-from gjb@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 7E43619B5C;
Wed, 11 Mar 2020 19:59:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BJxUdO079136;
Wed, 11 Mar 2020 19:59:30 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BJxTZR079134;
Wed, 11 Mar 2020 19:59:29 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202003111959.02BJxTZR079134@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Mar 2020 19:59:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358893 - user/gjb/thermite
X-SVN-Group: user
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: user/gjb/thermite
X-SVN-Commit-Revision: 358893
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2020 19:59:31 -0000
Author: gjb
Date: Wed Mar 11 19:59:29 2020
New Revision: 358893
URL: https://svnweb.freebsd.org/changeset/base/358893
Log:
Resync thermite with the re@ version:
- thermite.sh:
- Add support for aarch64 EC2 AMIs.
- Move creating seed src checkouts for amd64 and i386 to
zfs_mount_src().
- Create a zfs dataset for the amd64 and i386 userland which
later is snapshotted and cloned, eliminating multiple invocations
of the installworld target.
- Explicitly return 0 in build_chroots().
- Make use of ZFS a requirement.
- Update and sort Copyright.
zfs-setup.sh:
- Rename to zfs-cleanup.sh.
- Default to cleanup-only. ZFS datasets are now created via
thermite.sh.
This is the first batch of changes in preparation of adding support
for snapshot/release builds from both git and svn.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Added:
user/gjb/thermite/zfs-cleanup.sh
- copied, changed from r358892, user/gjb/thermite/zfs-setup.sh
Deleted:
user/gjb/thermite/zfs-setup.sh
Modified:
user/gjb/thermite/thermite.sh
Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh Wed Mar 11 19:57:43 2020 (r358892)
+++ user/gjb/thermite/thermite.sh Wed Mar 11 19:59:29 2020 (r358893)
@@ -1,7 +1,8 @@
#!/bin/sh
#-
-# Copyright (c) 2013-2018 The FreeBSD Foundation
# Copyright (c) 2012, 2013 Glen Barber
+# Copyright (c) 2013-2019 The FreeBSD Foundation
+# Copyright (c) 2020 Rubicon Communications, LLC (netgate.com)
# All rights reserved.
#
# Portions of this software were developed by Glen Barber
@@ -108,11 +109,9 @@ runall() {
}
check_use_zfs() {
- if [ -z ${use_zfs} ]; then
- return 1
- fi
if [ ! -c /dev/zfs ]; then
- return 1
+ echo "ZFS is required."
+ exit 1
fi
return 0
}
@@ -159,18 +158,29 @@ zfs_mount_tree() {
info "Cloning ${_clone}@clone to ${_target}"
zfs clone -p -o mountpoint=${_mount}/usr/${_tree} \
${_clone}@clone ${_target}
- if [ ! -z ${seed_src} ]; then
- # Only create chroot seeds for x86.
- if [ "${arch}" = "amd64" ] || [ "${arch}" = "i386" ]; then
- _seedmount=${chroots}/${rev}/${arch}/${type}
- _seedtarget="${zfs_parent}/${rev}-${arch}-${type}-chroot"
- zfs clone -p -o mountpoint=${_seedmount} \
- ${_clone}@clone ${_seedtarget}
- fi
- fi
unset _clone _mount _target _tree _seedmount _seedtarget
}
+zfs_mount_src() {
+ source_config || return 0
+ _tree=src
+ _clone="${zfs_parent}/${rev}-${_tree}-${type}"
+ # Only create chroot seeds for x86.
+ case ${arch} in
+ amd64|i386)
+ ;;
+ *)
+ return 0
+ ;;
+ esac
+ _seedmount=${chroots}/${rev}/${arch}/${type}
+ _seedtarget="${zfs_parent}/${rev}-${arch}-${type}-chroot"
+ info "Creating ${_seedtarget} from ${_clone}"
+ zfs clone -p -o mountpoint=${_seedmount} \
+ ${_clone}@clone ${_seedtarget}
+ unset _clone _mount _target _tree _seedmount _seedtarget
+}
+
zfs_create_tree() {
source_config || return 0
_tree=${1}
@@ -210,10 +220,13 @@ zfs_bootstrap() {
runall zfs_create_tree src
runall zfs_create_tree ports
runall zfs_create_tree doc
+ zfs_bootstrap_done=1
+}
+
+zfs_finish_bootstrap() {
runall zfs_mount_tree src
runall zfs_mount_tree ports
runall zfs_mount_tree doc
- zfs_bootstrap_done=1
}
prebuild_setup() {
@@ -345,9 +358,24 @@ upload_ec2_ami() {
_build="${rev}-${arch}-${kernel}-${type}"
_conf="${scriptdir}/${_build}.conf"
source_config || return 0
- case ${arch} in
- amd64)
+ case ${arch}:${kernel} in
+ amd64:GENERIC)
+ _EC2TARGET=amd64
+ _EC2TARGET_ARCH=amd64
;;
+ aarch64:GENERIC)
+ # XXX: temporary until support for stable/11 is added
+ case ${rev} in
+ 13|12)
+ _EC2TARGET=arm64
+ _EC2TARGET_ARCH=aarch64
+ ;;
+ *)
+ return 0
+ ;;
+ esac
+ # end XXX
+ ;;
*)
return 0
;;
@@ -371,9 +399,12 @@ upload_ec2_ami() {
EC2PUBLIC=${EC2PUBLIC} \
EC2PUBLICSNAP=${EC2PUBLICSNAP} \
EC2SNSTOPIC=${EC2SNSTOPIC} \
+ TARGET=${_EC2TARGET} \
+ TARGET_ARCH=${_EC2TARGET_ARCH} \
ec2ami \
>> ${logdir}/${_build}.ec2.log 2>&1
unset _build _conf AWSREGION AWSBUCKET AWSKEYFILE EC2PUBLIC EC2SNSTOPIC EC2PUBLICSNAP
+ unset _EC2TARGET _EC2TARGET_ARCH
umount ${CHROOTDIR}/dev
return 0
} # upload_ec2_ami()
@@ -464,23 +495,52 @@ install_chroots() {
_chrootarch="amd64"
;;
esac
+ [ ! -z $(eval echo \${zfs_${_chrootarch}_seed_${rev}_${type}}) ] \
+ && return 0
+ _clone="${zfs_parent}/${rev}-${_chrootarch}-worldseed-${type}"
+ _mount="/${zfs_mount}/${rev}-${arch}-worldseed-${type}"
_build="${rev}-${arch}-${kernel}-${type}"
_dest="${__WRKDIR_PREFIX}/${_build}"
_srcdir="${chroots}/${rev}/${_chrootarch}/${type}"
_objdir="${chroots}/${rev}-obj/${_chrootarch}/${type}"
- info "Creating ${_dest}"
- mkdir -p "${_dest}"
- info "Installing ${_dest}"
+ info "Creating ${_mount}"
+ zfs create -o atime=off -o mountpoint=${_mount} ${_clone}
+ info "Installing ${_mount}"
env MAKEOBJDIRPREFIX=${_objdir} \
make -C ${_srcdir} \
__MAKE_CONF=/dev/null SRCCONF=/dev/null \
TARGET=${_chrootarch} TARGET_ARCH=${_chrootarch} \
- DESTDIR=${_dest} \
+ DESTDIR=${_mount} \
installworld distribution >> \
${logdir}/${_build}.log 2>&1
- unset _build _dest _objdir _srcdir
+ zfs snapshot ${_clone}@clone
+ eval zfs_${_chrootarch}_seed_${rev}_${type}=1
+ unset _build _dest _objdir _srcdir _clone _mount
+
+ return 0
}
+zfs_clone_chroots() {
+ source_config || return 0
+ case ${arch} in
+ i386)
+ _chrootarch="i386"
+ ;;
+ *)
+ _chrootarch="amd64"
+ ;;
+ esac
+ _clone="${zfs_parent}/${rev}-${_chrootarch}-worldseed-${type}"
+ _mount="/${zfs_mount}/${rev}-${arch}-worldseed-${type}"
+ _build="${rev}-${arch}-${kernel}-${type}"
+ _dest="${__WRKDIR_PREFIX}/${_build}"
+ info "Cloning ${_chrootarch} world to ${zfs_parent}/${_build}"
+ zfs clone -p -o mountpoint=${_dest} ${_clone}@clone ${zfs_parent}/${_build}
+ unset _clone _mount _build _dest
+
+ return 0
+}
+
# Build amd64/i386 "seed" chroots for all branches being built.
build_chroots() {
source_config || return 0
@@ -519,6 +579,8 @@ build_chroots() {
${logdir}/${_build}.log 2>&1
eval chroot_${_chrootarch}_build_${rev}_${type}=1
unset _build _dest _objdir _srcdir
+
+ return 0
}
main() {
@@ -541,12 +603,17 @@ main() {
done
shift $(($OPTIND - 1))
[ -z ${CONF} ] && usage
+ use_zfs=1
+ check_use_zfs
zfs_bootstrap_done=
prebuild_setup
runall truncate_logs
zfs_bootstrap
+ runall zfs_mount_src
runall build_chroots
runall install_chroots
+ runall zfs_clone_chroots
+ zfs_finish_bootstrap
runall ${parallel}build_release
wait
runall upload_ec2_ami
Copied and modified: user/gjb/thermite/zfs-cleanup.sh (from r358892, user/gjb/thermite/zfs-setup.sh)
==============================================================================
--- user/gjb/thermite/zfs-setup.sh Wed Mar 11 19:57:43 2020 (r358892, copy source)
+++ user/gjb/thermite/zfs-cleanup.sh Wed Mar 11 19:59:29 2020 (r358893)
@@ -4,7 +4,7 @@
#
usage() {
- echo "$(basename ${0}) [-d] -c /path/to/configuration/file"
+ echo "$(basename ${0}) -d -c /path/to/configuration/file"
exit 1
}
@@ -92,26 +92,15 @@ zfs_teardown() {
done
done
done
- return 0
-}
-zfs_setup() {
- [ ! -z ${delete_only} ] && return 0
- for r in ${revs}; do
- for a in ${archs}; do
- for k in ${kernels}; do
- for t in ${types}; do
- s="${r}-${a}-${k}-${t}"
- if [ -e ${scriptdir}/${s}.conf ];
- then
- echo "${pfx} Creating ${zfs_parent}/${s}" \
- >/dev/stdout
- zfs create -o atime=off ${zfs_parent}/${s}
- fi
- done
- done
- done
- done
+ zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap@clone
+ zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap
+ zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap@clone
+ zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap
+
+ echo -n "ZFS datasets were destroyed. The will be created"
+ echo "automatically via thermite.sh."
+
return 0
}
@@ -154,8 +143,8 @@ main() {
pfx="==="
+ delete_only=1
zfs_teardown
- zfs_setup
}
main "$@"
From owner-svn-src-user@freebsd.org Wed Mar 11 20:20:22 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 1C2832698BC
for <svn-src-user@mailman.nyi.freebsd.org>;
Wed, 11 Mar 2020 20:20:22 +0000 (UTC) (envelope-from gjb@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 48d3H96PY2z4Z27;
Wed, 11 Mar 2020 20:20:21 +0000 (UTC) (envelope-from gjb@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 C7F8F19F13;
Wed, 11 Mar 2020 20:20:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BKKLQH091219;
Wed, 11 Mar 2020 20:20:21 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BKKLmY091218;
Wed, 11 Mar 2020 20:20:21 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202003112020.02BKKLmY091218@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Mar 2020 20:20:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358896 - user/gjb/thermite
X-SVN-Group: user
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: user/gjb/thermite
X-SVN-Commit-Revision: 358896
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2020 20:20:22 -0000
Author: gjb
Date: Wed Mar 11 20:20:21 2020
New Revision: 358896
URL: https://svnweb.freebsd.org/changeset/base/358896
Log:
Fix a spacing issue in printed output.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
user/gjb/thermite/zfs-cleanup.sh
Modified: user/gjb/thermite/zfs-cleanup.sh
==============================================================================
--- user/gjb/thermite/zfs-cleanup.sh Wed Mar 11 20:05:49 2020 (r358895)
+++ user/gjb/thermite/zfs-cleanup.sh Wed Mar 11 20:20:21 2020 (r358896)
@@ -99,7 +99,7 @@ zfs_teardown() {
zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap
echo -n "ZFS datasets were destroyed. The will be created"
- echo "automatically via thermite.sh."
+ echo " automatically via thermite.sh."
return 0
}
From owner-svn-src-user@freebsd.org Wed Mar 11 22:05:42 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 975E826C100
for <svn-src-user@mailman.nyi.freebsd.org>;
Wed, 11 Mar 2020 22:05:42 +0000 (UTC) (envelope-from gjb@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 48d5ck3NjPz4LsH;
Wed, 11 Mar 2020 22:05:42 +0000 (UTC) (envelope-from gjb@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 6F7241B470;
Wed, 11 Mar 2020 22:05:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BM5gL3056774;
Wed, 11 Mar 2020 22:05:42 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BM5g6X056773;
Wed, 11 Mar 2020 22:05:42 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202003112205.02BM5g6X056773@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Mar 2020 22:05:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r358900 - user/gjb/thermite
X-SVN-Group: user
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: user/gjb/thermite
X-SVN-Commit-Revision: 358900
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2020 22:05:42 -0000
Author: gjb
Date: Wed Mar 11 22:05:41 2020
New Revision: 358900
URL: https://svnweb.freebsd.org/changeset/base/358900
Log:
Fix a typo.
Submitted by: se@
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
user/gjb/thermite/zfs-cleanup.sh
Modified: user/gjb/thermite/zfs-cleanup.sh
==============================================================================
--- user/gjb/thermite/zfs-cleanup.sh Wed Mar 11 21:00:40 2020 (r358899)
+++ user/gjb/thermite/zfs-cleanup.sh Wed Mar 11 22:05:41 2020 (r358900)
@@ -98,7 +98,7 @@ zfs_teardown() {
zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap@clone
zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap
- echo -n "ZFS datasets were destroyed. The will be created"
+ echo -n "ZFS datasets were destroyed. They will be created"
echo " automatically via thermite.sh."
return 0