v2writable: initial cut for repo-rotation

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 1f831a7bf118be2649ef21b0936affa01abc2fb9..364ab602917eaa41cec96fb29f6d3ec7cac549e3 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -31,6 +31,7 @@ sub new {
                inbox => $ibx,
                path_type => '2/38', # or 'v2'
                ssoma_lock => 1, # disable for v2
+               bytes_added => 0,
        }, $class
 }
 
@@ -275,7 +276,9 @@ sub add {
 
        my $blob = $self->{mark}++;
        my $str = $mime->as_string;
-       print $w "blob\nmark :$blob\ndata ", length($str), "\n" or wfail;
+       my $n = length($str);
+       $self->{bytes_added} += $n;
+       print $w "blob\nmark :$blob\ndata ", $n, "\n" or wfail;
        print $w $str, "\n" or wfail;
        $str = undef;
 
@@ -325,7 +328,7 @@ sub add {
        $self->{tip} = ":$commit";
 }
 
-sub run_die ($$) {
+sub run_die ($;$) {
        my ($cmd, $env) = @_;
        my $pid = spawn($cmd, $env, undef);
        defined $pid or die "spawning ".join(' ', @$cmd)." failed: $!";
@@ -354,7 +357,7 @@ sub done {
        }
        if ($nchg) {
                run_die([@cmd, 'update-server-info'], undef);
-               eval {
+               ($self->{path_type} eq '2/38') and eval {
                        require PublicInbox::SearchIdx;
                        my $inbox = $self->{inbox} || $git_dir;
                        my $s = PublicInbox::SearchIdx->new($inbox);