about summary refs log tree commit homepage
path: root/script/public-inbox-purge
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-05-15 01:18:09 +0000
committerEric Wong <e@80x24.org>2019-05-15 06:15:34 +0000
commitd0e8bfd866ed1e924e8d9f551939eecbea4920ef (patch)
treef8d4ba5e37452e42d9851e793d5132484907e123 /script/public-inbox-purge
parentb5c64fc01d3e7ca6243fdd8b811b6291bdb12235 (diff)
downloadpublic-inbox-d0e8bfd866ed1e924e8d9f551939eecbea4920ef.tar.gz
Since we lazy-load Xapian now, some errors may become
more cryptic or buried.  Try to improve that by making
Admin show better errors.
Diffstat (limited to 'script/public-inbox-purge')
-rwxr-xr-xscript/public-inbox-purge53
1 files changed, 41 insertions, 12 deletions
diff --git a/script/public-inbox-purge b/script/public-inbox-purge
index 264bcdef..381826dc 100755
--- a/script/public-inbox-purge
+++ b/script/public-inbox-purge
@@ -7,16 +7,16 @@
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::Config;
-use PublicInbox::MIME;
 use PublicInbox::Admin qw(resolve_repo_dir);
-use PublicInbox::Filter::Base;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
+PublicInbox::Admin::check_require('-index');
+require PublicInbox::Filter::Base;
+require PublicInbox::Config;
+require PublicInbox::MIME;
+require PublicInbox::V2Writable;
 
-my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
+{ no warnings 'once'; *REJECT = *PublicInbox::Filter::Base::REJECT }
 
-eval { require PublicInbox::V2Writable } or die
-        "DBI, DBD::SQLite and Search::Xapian required for purge\n";
+my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
 my $config = eval { PublicInbox::Config->new };
 my $cfgfile = PublicInbox::Config::default_file();
 my ($all, $force);
@@ -63,11 +63,6 @@ if ($all) {
                                 mainrepo => $dir,
                         });
                 };
-
-                # somebody could "rm -r" all the Xapian directories;
-                # let them purge the overview, at least
-                $ibx->{indexlevel} ||= 'basic' unless $ibx->search;
-
                 push @inboxes, $ibx;
         }
 
@@ -77,6 +72,40 @@ if ($all) {
         }
 }
 
+foreach my $ibx (@inboxes) {
+        my $lvl = $ibx->{indexlevel};
+        if (defined $lvl) {
+                PublicInbox::Admin::indexlevel_ok_or_die($lvl);
+                next;
+        }
+
+        # Undefined indexlevel, so `full'...
+        # Search::Xapian exists and the DB can be read, at least, fine
+        $ibx->search and next;
+
+        # it's possible for a Xapian directory to exist, but Search::Xapian
+        # to go missing/broken.  Make sure it's purged in that case:
+        $ibx->over or die "no over.sqlite3 in $ibx->{mainrepo}\n";
+
+        # $ibx->{search} is populated by $ibx->over call
+        my $xdir_ro = $ibx->{search}->xdir(1);
+        my $npart = 0;
+        foreach my $part (<$xdir_ro/*>) {
+                if (-d $part && $part =~ m!/\d+\z!) {
+                        my $bytes = 0;
+                        $bytes += -s $_ foreach glob("$part/*");
+                        $npart++ if $bytes;
+                }
+        }
+        if ($npart) {
+                PublicInbox::Admin::require_or_die('-search');
+        } else {
+                # somebody could "rm -r" all the Xapian directories;
+                # let them purge the overview, at least
+                $ibx->{indexlevel} ||= 'basic';
+        }
+}
+
 my $data = do { local $/; scalar <STDIN> };
 $data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
 my $n_purged = 0;