sharedkv: lock and explicitly disconnect {dbh}

[public-inbox.git] / lib / PublicInbox / SharedKV.pm

diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index 072c94ca553827371a4740420d8c6da32c7d1b5c..77df0fb41bd090601662e18b149702f0f427fafe 100644 (file)
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -44,10 +44,7 @@ CREATE TABLE IF NOT EXISTS kv (
 sub new {
        my ($cls, $dir, $base, $opt) = @_;
        my $self = bless { opt => $opt }, $cls;
-       unless (defined $dir) {
-               $self->{tmpdir} = $dir = tempdir('skv-XXXXXX', TMPDIR => 1);
-               $self->{tmpid} = "$$.$self";
-       }
+       $dir //= $self->{"tmp$$.$self"} = tempdir("skv.$$-XXXX", TMPDIR => 1);
        -d $dir or mkdir($dir) or die "mkdir($dir): $!";
        $base //= '';
        my $f = $self->{filename} = "$dir/$base.sqlite3";
@@ -146,9 +143,25 @@ SELECT COUNT(k) FROM kv
        $sth->fetchrow_array;
 }
 
+sub dbh_release {
+       my ($self, $lock) = @_;
+       my $dbh = delete $self->{dbh} or return;
+       $lock //= $self->lock_for_scope; # may be needed for WAL
+       %{$dbh->{CachedKids}} = (); # cleanup prepare_cached
+       $dbh->disconnect;
+}
+
 sub DESTROY {
        my ($self) = @_;
-       rmtree($self->{tmpdir}) if ($self->{tmpid} // '') eq "$$.$self";
+       dbh_release($self);
+       my $dir = delete $self->{"tmp$$.$self"} or return;
+       my $tries = 0;
+       do {
+               $! = 0;
+               eval { rmtree($dir) };
+       } while ($@ && $!{ENOENT} && $tries++ < 5);
+       warn "error removing $dir: $@" if $@;
+       warn "Took $tries tries to remove $dir\n" if $tries;
 }
 
 1;