From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 35ECC1F543 for ; Thu, 25 Apr 2024 21:31:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1714080707; bh=o+1rum3T8hE0OLTFlHMcRmnT9/VGHZSnokPEQwSy3No=; h=From:To:Subject:Date:In-Reply-To:References:From; b=4l4vJz7XSxk9Uk2NODyKSmznoqDL6tqec0g+pIbY4p2lLwSLXwYSq9ISvmrej2agX +o8oSVPcrRXVzvDcQEmc/Uo6AVu0gj2Y9Ov6Sl35n7vEdyqZsIcLRaxiOjzzMAa9/2 rTsMsaL1G/Hk3ydCuL2avPiotBOZ1k07ZbXgPNqI= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/5] search: async_mset: pass resource errors to callback Date: Thu, 25 Apr 2024 21:31:45 +0000 Message-ID: <20240425213146.1166555-5-e@80x24.org> In-Reply-To: <20240425213146.1166555-1-e@80x24.org> References: <20240425213146.1166555-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We need to be able to handle resource limitation errors in public-facing daemons. --- lib/PublicInbox/Search.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 60d12dbf..b7732ae5 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -469,8 +469,12 @@ sub async_mset { if ($XHC) { # unconditionally retrieving pct + rank for now xdb($self); # populate {nshards} my @margs = ($self->xh_args, xh_opt($opt)); - my $rd = $XHC->mkreq(undef, 'mset', @margs, $qry_str); - PublicInbox::XhcMset->maybe_new($rd, $self, $cb, @args); + my $ret = eval { + my $rd = $XHC->mkreq(undef, 'mset', @margs, $qry_str); + PublicInbox::XhcMset->maybe_new($rd, $self, $cb, @args); + }; + $cb->(@args, undef, $@) if $@; + $ret; } else { # synchronous my $mset = $self->mset($qry_str, $opt); $cb->(@args, $mset);