[Piuparts-commits] [piuparts] 03/03: detect_archive_issues: mark logs for recycling on first appearance

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit ad92e4a42c0c45e6394a0ec62a2275f1f9d5dc54
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Mar 15 21:35:04 2017 +0100

    detect_archive_issues: mark logs for recycling on first appearance
    
    a buildd race (all vs. any desync) should be solved after a day
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                    | 1 +
 master-bin/detect_archive_issues.in | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ed9ac3a..58060fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ piuparts (0.77) UNRELEASED; urgency=medium
     - Support new states in plots (varying number of columns in counts.txt).
   * master-bin/detect_archive_issues:
     - Look at failed logs older than 24 hours (48 hours previously).
+    - Mark logfiles for immediate recycling upon first appearance.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 12 Mar 2017 23:30:21 +0100
 
diff --git a/master-bin/detect_archive_issues.in b/master-bin/detect_archive_issues.in
index a08d24a..4de71c8 100755
--- a/master-bin/detect_archive_issues.in
+++ b/master-bin/detect_archive_issues.in
@@ -38,13 +38,18 @@ URLS=`mktemp`
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 	URL_SED="s#$MASTER/$SECTION/fail#$URLBASE/$SECTION/untestable#"
-	mkdir -p $MASTER/$SECTION/fail/ $MASTER/$SECTION/untestable/
+	mkdir -p $MASTER/$SECTION/fail/ $MASTER/$SECTION/untestable/ $MASTER/$SECTION/recycle/
 	# '-mtime +0' actually means '24 hours or older'
 	find $MASTER/$SECTION/fail -name '*.log' -mtime +0 | xargs -r \
 		grep -l -E "E: Broken packages|E: Unable to correct problems, you have held broken packages|E: Error, pkgProblemResolver::Resolve generated breaks" 2>/dev/null > $LOGS
 	if [ -s $LOGS ]; then
 		for package_log in $(cat $LOGS)
 		do
+			URL=$(echo "$package_log" | sed "$URL_SED")
+			if ! grep -q "$URL" $ISSUE_LOG ; then
+				# immediately recycle upon first appearance
+				ln -f $package_log $MASTER/$SECTION/recycle/
+			fi
 			mv $package_log $MASTER/$SECTION/untestable/
 		done
 		sed "$URL_SED" $LOGS >> $URLS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git