From owner-cvs-ports@FreeBSD.ORG Tue Dec 28 05:50:38 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CB8516A4CE; Tue, 28 Dec 2004 05:50:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03D4143D4C; Tue, 28 Dec 2004 05:50:38 +0000 (GMT) (envelope-from kris@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBS5obcD093935; Tue, 28 Dec 2004 05:50:37 GMT (envelope-from kris@repoman.freebsd.org) Received: (from kris@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBS5obTh093934; Tue, 28 Dec 2004 05:50:37 GMT (envelope-from kris) Message-Id: <200412280550.iBS5obTh093934@repoman.freebsd.org> From: Kris Kennaway Date: Tue, 28 Dec 2004 05:50:37 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: ports/Tools/portbuild/scripts dosetupnode X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Dec 2004 05:50:38 -0000 kris 2004-12-28 05:50:37 UTC FreeBSD ports repository Modified files: Tools/portbuild/scripts dosetupnode Log: * Support the -norsync argument to only remove the existing build chroots on a disconnected client, without running the time-consuming rsyncs. This is useful when a build is interrupted and needs to be restarted. * After we have cleaned up the machine, reset the queue counter by using pollmachine -queue. This has a race condition if other builds are being dispatched to the machine (e.g. builds on another branch): getmachine can claim a directory and increment the counter, then the machine is polled and finds e.g. 0 chroots in use, and resets the counter to 0, then claim-chroot is run and the build dispatched, with the counter now off-by-one. This could be fixed by running claim-chroot with the .lock held, but this turns out to be too time-consuming. A two-level lock approach might also fix this efficiently. Revision Changes Path 1.4 +8 -2 ports/Tools/portbuild/scripts/dosetupnode