From 5fa6ed1bb3458f5077a46eb0c6516c277d93318c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 23 Jun 2015 13:26:43 +0100 Subject: [PATCH] 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. --- infra/dgit-repos-policy-debian | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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; -- 2.30.2