From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1AE8C41604 for ; Wed, 7 Oct 2020 18:27:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9022721707 for ; Wed, 7 Oct 2020 18:27:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9022721707 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.3700.10962 (Exim 4.92) (envelope-from ) id 1kQEA2-0002u7-GN; Wed, 07 Oct 2020 18:27:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3700.10962; Wed, 07 Oct 2020 18:27:34 +0000 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" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQEA1-0002t9-Ft; Wed, 07 Oct 2020 18:27:33 +0000 Received: by outflank-mailman (input) for mailman id 3700; Wed, 07 Oct 2020 18:27:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3o-00072Q-Jr for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:08 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 32357582-01ed-4322-ad57-48dd5f33319b; Wed, 07 Oct 2020 18:19:57 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-9Z; Wed, 07 Oct 2020 19:00:39 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3o-00072Q-Jr for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:08 +0000 X-Inumbo-ID: 32357582-01ed-4322-ad57-48dd5f33319b Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 32357582-01ed-4322-ad57-48dd5f33319b; Wed, 07 Oct 2020 18:19:57 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDjz-0007CF-9Z; Wed, 07 Oct 2020 19:00:39 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 24/82] host allocation: *_shared_mark_ready: Allow other states Date: Wed, 7 Oct 2020 18:59:26 +0100 Message-Id: <20201007180024.7932-25-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ian Jackson Generalise these functions so they can set the state to something other than `ready', and so that they can expect a state other than `prep'. No functional change with existing callers. Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 19 +++++++++++-------- Osstest/JobDB/Executive.pm | 5 +++-- Osstest/TestSupport.pm | 6 +++--- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 703f3d85..f0038f6b 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -1050,11 +1050,14 @@ END return $shared; } -sub executive_resource_shared_mark_ready ($$$) { - my ($restype, $resname, $sharetype) = @_; +sub executive_resource_shared_mark_ready ($$$;$$) { + my ($restype, $resname, $sharetype, $oldstate, $newstate) = @_; # must run outside transaction my $oldshr; + $oldstate //= 'prep'; + $newstate //= 'ready'; + my $what= "resource $restype $resname"; $sharetype .= ' '.get_harness_rev(); @@ -1063,11 +1066,11 @@ sub executive_resource_shared_mark_ready ($$$) { if (defined $oldshr) { die "$what shared $oldshr->{Type} not $sharetype" unless $oldshr->{Type} eq $sharetype; - die "$what shared state $oldshr->{State} not prep" - unless $oldshr->{State} eq 'prep'; - my $nrows= $dbh_tests->do(<{State} not $oldstate" + unless $oldshr->{State} eq $oldstate; + my $nrows= $dbh_tests->do(<jobdb_resource_shared_mark_ready('host', $ho->{Name}, - $sharetype); + $sharetype, $oldstate, $newstate); } sub gitcache_setup ($) { -- 2.20.1