From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 23 Jun 2015 12:26:43 +0000 (+0100)
Subject: Infra: Improve db retry handling
X-Git-Tag: debian/0.30~56
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5fa6ed1bb3458f5077a46eb0c6516c277d93318c;hp=9e3287b0f9611af321b7cb1ca7b7757dbe96cfd2

Infra: Improve db retry handling

Use theh new poldb_setup hook to (a) set up HandleError and (b) run
the DGIT_RPD_TEST_DBLOOP_HOOK.

This is needed because the PRAGMA in poldb_setup can cause a
SQLITE_BUSY error in newer sqlite3, and we want both the HandleError
setup and the hook (which sets a timeout, amongst other things) to
occur before sqlite3 tries to take its lock.
---

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 4af7551c..b21f7976 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -461,17 +461,18 @@ my @orgargv = @ARGV;
 for (;;) {
     @ARGV = @orgargv;
     eval {
-	poldb_setup(poldb_path($repos));
-	$stderr = '';
+	poldb_setup(poldb_path($repos), sub {
+	    $poldbh->{HandleError} = sub {
+		return 0 unless $poldbh->err == 5; # SQLITE_BUSY, not in .pm :-(
+		die bless { }, $db_busy_exception;
+	    };
 
-	eval ($ENV{'DGIT_RPD_TEST_DBLOOP_HOOK'}//'');
-	die $@ if length $@;
-	# used by tests/tests/debpolicy-dbretry
+	    eval ($ENV{'DGIT_RPD_TEST_DBLOOP_HOOK'}//'');
+	    die $@ if length $@;
+	    # used by tests/tests/debpolicy-dbretry
+        });
 
-	$poldbh->{HandleError} = sub {
-	    return 0 unless $poldbh->err == 5; # SQLITE_BUSY, not in .pm :-(
-	    die bless { }, $db_busy_exception;
-	};
+	$stderr = '';
 
 	$rcode = $fn->();
 	die unless defined $rcode;