From patchwork Wed Oct 7 17:59:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11821485 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 341D917CF for ; Wed, 7 Oct 2020 18:27:54 +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 0C79721707 for ; Wed, 7 Oct 2020 18:27:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C79721707 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.3694.10896 (Exim 4.92) (envelope-from ) id 1kQE9r-0002PT-FK; Wed, 07 Oct 2020 18:27:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3694.10896; Wed, 07 Oct 2020 18:27:23 +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 1kQE9q-0002Od-V2; Wed, 07 Oct 2020 18:27:22 +0000 Received: by outflank-mailman (input) for mailman id 3694; Wed, 07 Oct 2020 18:27:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3t-00072Q-Jv for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:13 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ace94ed7-c910-40bb-bbf1-9495690a4b88; Wed, 07 Oct 2020 18:20:00 +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 1kQDjy-0007CF-8H; Wed, 07 Oct 2020 19:00:38 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE3t-00072Q-Jv for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:21:13 +0000 X-Inumbo-ID: ace94ed7-c910-40bb-bbf1-9495690a4b88 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ace94ed7-c910-40bb-bbf1-9495690a4b88; Wed, 07 Oct 2020 18:20:00 +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 1kQDjy-0007CF-8H; Wed, 07 Oct 2020 19:00:38 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 20/82] ts-hosts-allocate-Executive: Fix handling of failed preps for same sharing Date: Wed, 7 Oct 2020 18:59:22 +0100 Message-Id: <20201007180024.7932-21-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 This code was previously unreachable. It ought to be executed when all the shares are allocatable or prep: in that case, we can unshare and re-share the host. Signed-off-by: Ian Jackson --- ts-hosts-allocate-Executive | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive index 78b94c6d..2c18a739 100755 --- a/ts-hosts-allocate-Executive +++ b/ts-hosts-allocate-Executive @@ -1044,12 +1044,11 @@ sub actual_allocation ($) { # now-dead task. If so that share will become allocatable # (and therefore not be counted in `ntasks') in due course. return undef; - - # someone was preparing it but they aren't any more - push @allocwarnings, - "previous preparation apparently abandoned"; - $allocatable= 1; - } + } + # someone was preparing it but they aren't any more + push @allocwarnings, + "previous preparation apparently abandoned"; + $allocatable= 1; } }