[PATCH] searchidx: check for graceful shutdown in log2stack

[PATCH] searchidx: check for graceful shutdown in log2stack

[Eric Wong]

The initial "git log" invocation for a git epoch can be time
consuming, so check for graceful shutdown at each line to ensure
timely shutdowns and avoid SSD/HDD wear.
---
 lib/PublicInbox/SearchIdx.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 90d8c8b3..1466b88b 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -753,6 +753,7 @@ sub log2stack ($$$) {
 				$range);
 	my ($at, $ct, $stk, $cmt);
 	while (<$fh>) {
+		last if $sync->{quit};
 		if (/\A([0-9]+)-([0-9]+)-($OID)$/o) {
 			($at, $ct, $cmt) = ($1 + 0, $2 + 0, $3);
 			$stk //= PublicInbox::IdxStack->new($cmt);
@@ -775,7 +776,9 @@ sub log2stack ($$$) {
 			$stk->push_rec('m', $at, $ct, $oid, $cmt);
 		}
 	}
-	close $fh or die "git log failed: \$?=$?";
+	unless (close $fh) {
+		die "git log failed: \$?=$?" unless $sync->{quit};
+	}
 	$stk //= PublicInbox::IdxStack->new;
 	$stk->read_prepare;
 }

[PATCH v2] searchidx: check for graceful shutdown in log2stack

[Eric Wong]

The initial "git log" invocation for a git epoch can be time
consuming, so check for graceful shutdown at each line to ensure
timely shutdowns and avoid SSD/HDD wear.
---
 v2: much simpler than v1, since log2stack and prepare_stack
     callers already understand a `undef' return value.

 lib/PublicInbox/SearchIdx.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 90d8c8b3..6ff2cf94 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -753,6 +753,7 @@ sub log2stack ($$$) {
 				$range);
 	my ($at, $ct, $stk, $cmt);
 	while (<$fh>) {
+		return if $sync->{quit};
 		if (/\A([0-9]+)-([0-9]+)-($OID)$/o) {
 			($at, $ct, $cmt) = ($1 + 0, $2 + 0, $3);
 			$stk //= PublicInbox::IdxStack->new($cmt);