From patchwork Mon Jun 7 15:16:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12303875 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 57EE4C47095 for ; Mon, 7 Jun 2021 15:16:35 +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 2064E60C3D for ; Mon, 7 Jun 2021 15:16:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2064E60C3D 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.138037.255641 (Exim 4.92) (envelope-from ) id 1lqGzM-0005Y4-2z; Mon, 07 Jun 2021 15:16:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 138037.255641; Mon, 07 Jun 2021 15:16:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqGzL-0005Ww-SB; Mon, 07 Jun 2021 15:16:27 +0000 Received: by outflank-mailman (input) for mailman id 138037; Mon, 07 Jun 2021 15:16:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqGzL-0005Tl-2l for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqGzL-0002b3-23 for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:27 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1lqGzL-0001kl-0z for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:27 +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 1lqGzJ-0000i8-Bp; Mon, 07 Jun 2021 16:16:25 +0100 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" 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=JHUIEH7NL3PT02iIBi/javiAsHyQsQsZlPsWHQfpTwc=; b=AfvlUeN9i4JTYE/cd5S6QYv3+5 DGpFb5Ie4Zet/scfwVduvHCSe6Sw5STd2LtM2C8an4nHyUl8I97/+43pNWZc2zrzyhGHz2wigaldz lk6WWZEHSqM2iP6cuWTF0fTHDw/fbCFuh2sc8NNyW+4mdUcUbjKSJK7pCFRaUKvBtroU=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 3/3] host allocation: Avoid starving out failing tests Date: Mon, 7 Jun 2021 16:16:14 +0100 Message-Id: <20210607151614.14132-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607151614.14132-1-iwj@xenproject.org> References: <20210607151614.14132-1-iwj@xenproject.org> MIME-Version: 1.0 This can result in bad pushes. Better to wait. Signed-off-by: Ian Jackson --- ts-hosts-allocate-Executive | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive index 849bc97b..4dfcd0cd 100755 --- a/ts-hosts-allocate-Executive +++ b/ts-hosts-allocate-Executive @@ -704,6 +704,7 @@ sub hid_recurse ($$) { Selections => [ map { $_->{Selected} } @hids ], Start => $start_time, Duration => $duration, + PrevFail => ($previously_failed || $previously_failed_equiv), }; } } @@ -951,7 +952,11 @@ sub attempt_allocation { } $starvation_q->finish(); if ($all_starving) { - return $alloc_starved_r; + if (!$best->{PrevFail}) { + return $alloc_starved_r; + } else { + logm "starving, but previously failed, so continue..."; + } } } }