From owner-svn-src-user@FreeBSD.ORG Sun Nov 17 21:36:20 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C2B5ED7; Sun, 17 Nov 2013 21:36:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E65A125F7; Sun, 17 Nov 2013 21:36:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHLaJhY074341; Sun, 17 Nov 2013 21:36:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHLaJSq074339; Sun, 17 Nov 2013 21:36:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201311172136.rAHLaJSq074339@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 17 Nov 2013 21:36:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258279 - user/nwhitehorn/condorports X-SVN-Group: user 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.16 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Nov 2013 21:36:20 -0000 Author: nwhitehorn Date: Sun Nov 17 21:36:19 2013 New Revision: 258279 URL: http://svnweb.freebsd.org/changeset/base/258279 Log: Something that is not a crashfest: use tmpfs and tar. This imposes a two second per job penalty on my powermac G5. Larger penalties could be expected for slow storage. For platforms that support it, and where the repo is local, zfs clone could also work. We should really fix FUSE not to crash. Modified: user/nwhitehorn/condorports/prepbuildjail user/nwhitehorn/condorports/reapbuildjail Modified: user/nwhitehorn/condorports/prepbuildjail ============================================================================== --- user/nwhitehorn/condorports/prepbuildjail Sun Nov 17 21:33:32 2013 (r258278) +++ user/nwhitehorn/condorports/prepbuildjail Sun Nov 17 21:36:19 2013 (r258279) @@ -47,20 +47,18 @@ $slot { mount.fstab="/scratch/$slot.fstab"; } EOF -# TODO: Setting nosuid seems to break "below" -echo "/scratch/$release /scratch/$slot unionfs below,noatime 0 0" > /scratch/$slot.fstab + +mkdir -p /scratch/$slot +mount -t tmpfs tmpfs /scratch/$slot + +#cp -a /scratch/$release/ /scratch/$slot +tar -C /scratch/$slot -xf /scratch/$release.tar if [ -n "$ports" ]; then mkdir -p /scratch/$slot/$ports echo "$ports /scratch/$slot/$ports nullfs ro 0 0" >> /scratch/$slot.fstab fi -mkdir -p /scratch/$slot - jail -f /scratch/$slot.conf -c $slot -ls /scratch/$slot/dev > /dev/null # Hack around unionfs bugs -if [ -n "$ports" ]; then - ls /scratch/$slot/$ports > /dev/null # And once more -fi trap true EXIT rm /scratch/$slot.lock Modified: user/nwhitehorn/condorports/reapbuildjail ============================================================================== --- user/nwhitehorn/condorports/reapbuildjail Sun Nov 17 21:33:32 2013 (r258278) +++ user/nwhitehorn/condorports/reapbuildjail Sun Nov 17 21:36:19 2013 (r258279) @@ -19,7 +19,7 @@ set +e set -o noclobber echo > /scratch/$slot.lock jail -f /scratch/$slot.conf -r $slot -chflags -R noschg /scratch/$slot +umount -f /scratch/$slot || true rm -rf /scratch/$slot /scratch/$slot.conf /scratch/$slot.fstab set +e rm /scratch/$slot.lock