X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FV2Writable.pm;h=34f13e26cb2531ebda1da78266357f5c00aa01d2;hb=66e91d22b9899aaf5baea05b5e1652a35472b966;hp=6394d300fa2eb8e8d6f0287eaa7935c9233194f2;hpb=33244ea82ffd35f40ac82d81a857005587842454;p=public-inbox.git

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6394d300..34f13e26 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -137,7 +137,7 @@ sub num_for {
 		warn "<$mid> reused for mismatched content\n";
 
 		# try the rest of the mids
-		foreach my $i (1..$#$mids) {
+		for(my $i = $#$mids; $i >= 1; $i--) {
 			my $m = $mids->[$i];
 			$num = $self->{skel}->{mm}->mid_insert($m);
 			if (defined $num) {
@@ -552,7 +552,7 @@ sub reindex_oid {
 		$num = $$regen--;
 		die "BUG: ran out of article numbers\n" if $num <= 0;
 		my $mm = $self->{skel}->{mm};
-		foreach my $mid (@$mids) {
+		foreach my $mid (reverse @$mids) {
 			if ($mm->mid_set($num, $mid) == 1) {
 				$mid0 = $mid;
 				last;
@@ -560,7 +560,11 @@ sub reindex_oid {
 		}
 		if (!defined($mid0)) {
 			my $id = '<' . join('> <', @$mids) . '>';
-			warn "Message-Id $id unusable for $num\n";
+			warn "Message-ID $id unusable for $num\n";
+			foreach my $mid (@$mids) {
+				defined(my $n = $mm->num_for($mid)) or next;
+				warn "#$n previously mapped for <$mid>\n";
+			}
 		}
 	}
 
@@ -661,8 +665,17 @@ sub reindex {
 		}
 		delete $self->{reindex_pipe};
 	}
+	my $gaps;
+	if ($regen && $$regen != 0) {
+		warn "W: leftover article number ($$regen)\n";
+		$gaps = 1;
+	}
 	my ($min, $max) = $mm_tmp->minmax;
-	defined $max and die "leftover article numbers at $min..$max\n";
+	if (defined $max) {
+		warn "W: leftover article numbers at $min..$max\n";
+		$gaps = 1;
+	}
+	warn "W: were old git partitions deleted?\n" if $gaps;
 	my @d = sort keys %$D;
 	if (@d) {
 		warn "BUG: ", scalar(@d)," unseen deleted messages marked\n";