From patchwork Wed Oct 7 17:59:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11821467 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36F2217CF for ; Wed, 7 Oct 2020 18:27:23 +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 0D1EE2168B for ; Wed, 7 Oct 2020 18:27:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D1EE2168B 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.3684.10777 (Exim 4.92) (envelope-from ) id 1kQE9W-0001Qx-6k; Wed, 07 Oct 2020 18:27:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3684.10777; Wed, 07 Oct 2020 18:27:02 +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 1kQE9V-0001Q9-Mq; Wed, 07 Oct 2020 18:27:01 +0000 Received: by outflank-mailman (input) for mailman id 3684; Wed, 07 Oct 2020 18:26:59 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3j-00072Q-Jm for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:03 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 22b02326-6e00-4a43-a9af-37635fe05050; Wed, 07 Oct 2020 18:19:55 +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 1kQDk0-0007CF-Is; Wed, 07 Oct 2020 19:00:40 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3j-00072Q-Jm for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:03 +0000 X-Inumbo-ID: 22b02326-6e00-4a43-a9af-37635fe05050 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 22b02326-6e00-4a43-a9af-37635fe05050; Wed, 07 Oct 2020 18:19:55 +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 1kQDk0-0007CF-Is; Wed, 07 Oct 2020 19:00:40 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 29/82] host allocation: *_shared_mark_ready: Only prod when $newstate is ready Date: Wed, 7 Oct 2020 18:59:31 +0100 Message-Id: <20201007180024.7932-30-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 From: Ian Jackson Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index f2d43464..4cd4aa50 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -1092,13 +1092,15 @@ END END } }); - if (!eval { - my $qserv = tcpconnect_queuedaemon(); - print $qserv "prod\n" or die $!; - $_ = <$qserv>; defined && m/^OK prod\b/ or die "$_ ?"; - 1; - }) { - logm("post-mark-ready queue daemon prod failed: $@"); + if ($newstate eq 'ready') { + if (!eval { + my $qserv = tcpconnect_queuedaemon(); + print $qserv "prod\n" or die $!; + $_ = <$qserv>; defined && m/^OK prod\b/ or die "$_ ?"; + 1; + }) { + logm("post-mark-ready queue daemon prod failed: $@"); + } } if ($oldshr) { logm("$restype $resname shared $sharetype marked $newstate");