sharedkv: release {dbh} before rmtree

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

diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm
index 94f2429fdda2eaf51b3c378b5bd4c383bec43b8b..f5d09cc14dcfe3022539be322b53c77daad93701 100644 (file)
--- a/lib/PublicInbox/SharedKV.pm
+++ b/lib/PublicInbox/SharedKV.pm
@@ -145,8 +145,15 @@ SELECT COUNT(k) FROM kv
 
 sub DESTROY {
        my ($self) = @_;
+       delete $self->{dbh};
        my $dir = delete $self->{"tmp$$.$self"} or return;
-       rmtree($dir);
+       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;