From owner-svn-ports-all@freebsd.org Thu Feb 22 05:52:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31EA5F04935; Thu, 22 Feb 2018 05:52:58 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DBD366DACF; Thu, 22 Feb 2018 05:52:57 +0000 (UTC) (envelope-from bdrewery@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 D6C2F23852; Thu, 22 Feb 2018 05:52:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1M5qv6G074209; Thu, 22 Feb 2018 05:52:57 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M5qv2F074207; Thu, 22 Feb 2018 05:52:57 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201802220552.w1M5qv2F074207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 22 Feb 2018 05:52:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462560 - in head/ports-mgmt/poudriere-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/ports-mgmt/poudriere-devel: . files X-SVN-Commit-Revision: 462560 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 05:52:58 -0000 Author: bdrewery Date: Thu Feb 22 05:52:57 2018 New Revision: 462560 URL: https://svnweb.freebsd.org/changeset/ports/462560 Log: Fix jail cleanup waiting too long on HTML JSON process to exit Modified: head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Thu Feb 22 03:00:30 2018 (r462559) +++ head/ports-mgmt/poudriere-devel/Makefile Thu Feb 22 05:52:57 2018 (r462560) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.2.99.20180202 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh ============================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh Thu Feb 22 03:00:30 2018 (r462559) +++ head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh Thu Feb 22 05:52:57 2018 (r462560) @@ -4,21 +4,25 @@ Date: Sat Feb 3 16:39:51 2018 -0800 HTML: Hide harmless shared lock failures -diff --git src/share/poudriere/include/html.sh src/share/poudriere/include/html.sh -index c56cb6520..98bcd84f4 100644 ---- src/share/poudriere/include/html.sh +commit 129a3b0bfde6bf77982ebece039aaa745ead8b2a +Author: Bryan Drewery +Date: Sat Feb 3 17:58:53 2018 -0800 + + HTML: Only wait for shared locks for 2 seconds each + +--- src/share/poudriere/include/html.sh.orig 2018-02-22 05:50:35 UTC +++ src/share/poudriere/include/html.sh @@ -78,11 +78,11 @@ html_json_main() { build_all_json() { critical_start build_json - if slock_acquire "json_jail_${MASTERNAME}"; then -+ if slock_acquire "json_jail_${MASTERNAME}" 2>/dev/null; then ++ if slock_acquire "json_jail_${MASTERNAME}" 2 2>/dev/null; then build_jail_json slock_release "json_jail_${MASTERNAME}" fi - if slock_acquire "json_top"; then -+ if slock_acquire "json_top" 2>/dev/null; then ++ if slock_acquire "json_top" 2 2>/dev/null; then build_top_json slock_release "json_top" fi @@ -27,7 +31,7 @@ index c56cb6520..98bcd84f4 100644 local dest="$3" - slock_acquire html_base || return 0 -+ slock_acquire html_base 2>/dev/null || return 0 ++ slock_acquire html_base 2>/dev/null 2 || return 0 # Update the base copy mkdir -p "${base}"