From nobody Mon Feb 9 19:47:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1603385150; cv=none; d=zohomail.com; s=zohoarc; b=AThOCuj4LqCBLcybkCUdYTaon9cAQz3L9k5zLvxcyX/1T4/RLtkffiVN2+C2jGXJTI90fXIFxrtr7IXQfr/FnNIeuXIpMz0YPW6viKelHUzN7Zo7wuQRr0MJnwB7L5yOf0nfNqdU2XUdIk9fCusbFJQKzlhSkClG89EOcpTaF2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603385150; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pVToY0m3Sc+yduYNkjYcp+9aOZ5fk0ZnWu2I935eP+I=; b=Vj4XiRV0ITNyITHBs2/vP7x5Y0EAc7tB/6KOtcJN7lT+/XRxpsJ9RbrE9N/uFJdKHOOTXJeoEFN5uju65m3xOx5cWPvpA3CQGfiHp4TNey07HzwyuG9O/CWmkmLDHTFbrDN0e8AXqcpHJVlbRRgEPtEIUFs+bEP6DvfblF/v06k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1603385150048474.42952663801134; Thu, 22 Oct 2020 09:45:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.10564.28165 (Exim 4.92) (envelope-from ) id 1kVdiX-0007bF-J5; Thu, 22 Oct 2020 16:45:33 +0000 Received: by outflank-mailman (output) from mailman id 10564.28165; Thu, 22 Oct 2020 16:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVdiX-0007b2-E6; Thu, 22 Oct 2020 16:45:33 +0000 Received: by outflank-mailman (input) for mailman id 10564; Thu, 22 Oct 2020 16:45:32 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVdiW-0007J4-GJ for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:32 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1bfb5d76-f5c8-40c1-9df1-aa70e381cd8b; Thu, 22 Oct 2020 16:45:15 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVdiF-0005KF-Pr for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:15 +0000 Received: from iwj (helo=mynotebook.example.org) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1kVdiF-0007Qx-Ot for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:15 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1kVdiE-00059e-38; Thu, 22 Oct 2020 17:45:14 +0100 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVdiW-0007J4-GJ for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:32 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1bfb5d76-f5c8-40c1-9df1-aa70e381cd8b; Thu, 22 Oct 2020 16:45:15 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVdiF-0005KF-Pr for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:15 +0000 Received: from iwj (helo=mynotebook.example.org) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1kVdiF-0007Qx-Ot for xen-devel@lists.xenproject.org; Thu, 22 Oct 2020 16:45:15 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1kVdiE-00059e-38; Thu, 22 Oct 2020 17:45:14 +0100 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1bfb5d76-f5c8-40c1-9df1-aa70e381cd8b DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=pVToY0m3Sc+yduYNkjYcp+9aOZ5fk0ZnWu2I935eP+I=; b=mbfhseFH6bQXqaNQMBa7wubdjY 9aJgs0UHrwf56Pda0zztYS98M3mWdtQ6SCMltkv5tbQPsMMvKmwWmy7+kYJqDoSPewOzimwKQvPtj anFermhV+Lf2ugm+sMI1Biz8GkQUQLKANSVWRTimvAPBtjYK4nG3be9szLR0PwHEsVao=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 02/16] share in jobdb: Move out-of-flight special case higher up Date: Thu, 22 Oct 2020 17:44:52 +0100 Message-Id: <20201022164506.1552-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022164506.1552-1-iwj@xenproject.org> References: <20201022164506.1552-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xenproject.org) Content-Type: text/plain; charset="utf-8" This avoids running the runvar computation loop outside flights. This is good amongst other things because that loop prints warnings about undef $flight and $job. Signed-off-by: Ian Jackson --- Osstest/JobDB/Executive.pm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm index 071f31f1..4fa42e5d 100644 --- a/Osstest/JobDB/Executive.pm +++ b/Osstest/JobDB/Executive.pm @@ -587,6 +587,18 @@ END $constraintsq->fetchrow_array() or confess "$hostname ?"; }; =20 + + if (!defined $flight) { + db_retry($dbh_tests,[], sub { + $insertq->execute($hostname, $ttaskid, + undef,undef, + undef, + undef,undef); + $checkconstraints->(); + }); + return; + } + my $ojvn =3D "$ho->{Ident}_lifecycle"; =20 if (length $r{$ojvn}) { @@ -660,26 +672,17 @@ END } } =20 - if (defined $flight) { - $insertq->execute($hostname, $ttaskid, - $flight, $job, - ($mode eq 'selectprep')+0, + $insertq->execute($hostname, $ttaskid, + $flight, $job, + ($mode eq 'selectprep')+0, # ^ DBD::Pg doesn't accept perl canonical false for bool! # https://rt.cpan.org/Public/Bug/Display.html?id=3D133229 - $tident, $tstepno); - } else { - $insertq->execute($hostname, $ttaskid, - undef,undef, - undef, - undef,undef); - } + $tident, $tstepno); $checkconstraints->(); }); =20 - if (defined $flight) { - push @lifecycle, $newsigil if length $newsigil; - store_runvar($ojvn, "@lifecycle"); - } + push @lifecycle, $newsigil if length $newsigil; + store_runvar($ojvn, "@lifecycle"); } =20 sub current_stepno ($) { #method --=20 2.20.1