From owner-svn-src-projects@FreeBSD.ORG  Mon May 28 23:35:17 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 05E20106564A;
	Mon, 28 May 2012 23:35:17 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E60358FC15;
	Mon, 28 May 2012 23:35:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4SNZGq9040157;
	Mon, 28 May 2012 23:35:16 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4SNZGEe040155;
	Mon, 28 May 2012 23:35:16 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201205282335.q4SNZGEe040155@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 28 May 2012 23:35:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236211 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2012 23:35:17 -0000

Author: linimon (doc,ports committer)
Date: Mon May 28 23:35:16 2012
New Revision: 236211
URL: http://svn.freebsd.org/changeset/base/236211

Log:
  Clean up claim-chroots that failed (usually due to ssh timeout after copy
  to client).  This relieves pressure on /tmp on the clients.

Modified:
  projects/portbuild/scripts/cleanup-chroots

Modified: projects/portbuild/scripts/cleanup-chroots
==============================================================================
--- projects/portbuild/scripts/cleanup-chroots	Mon May 28 23:32:18 2012	(r236210)
+++ projects/portbuild/scripts/cleanup-chroots	Mon May 28 23:35:16 2012	(r236211)
@@ -14,6 +14,7 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
 REMOVE_EMPTY_BUILD_TIME=10080
 REMOVE_INUSE_CHROOT_TIME=7200
 REMOVE_NOTINUSE_CHROOT_TIME=60
+REMOVE_NOTINUSE_CLAIM_CHROOT_TIME=60
 
 #VERBOSE=1
 
@@ -163,3 +164,18 @@ if [ ! -z "${stale_builds}" ]; then
 	rm -rf ${build}
     done
 fi
+
+# cleanup claim-chroots that failed (usually due to ssh timeout after
+# copy to client)
+# XXX MCL assuming that mktemp using /tmp in claim-chroot
+stale_claim_chroots=$(find /tmp -name claim-chroot.* -prune -mmin +${REMOVE_NOTINUSE_CLAIM_CHROOT_TIME} 2> /dev/null)
+if [ ! -z "${stale_claim_chroots}" ]; then
+    if [ $VERBOSE ]; then
+	echo "cleanup-chroots: suspected stale claim_chroots on $(hostname):"
+	echo ${stale_claim_chroots}
+	echo
+    fi
+    for claim_chroot in ${stale_claim_chroots}; do
+	rm -rf ${claim_chroot}
+    done
+fi