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=-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 26F8AC47094 for ; Mon, 7 Jun 2021 15:16:36 +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 D62926054E for ; Mon, 7 Jun 2021 15:16:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D62926054E 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.138036.255635 (Exim 4.92) (envelope-from ) id 1lqGzL-0005UL-Mj; Mon, 07 Jun 2021 15:16:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 138036.255635; Mon, 07 Jun 2021 15:16:27 +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-0005UC-JG; Mon, 07 Jun 2021 15:16:27 +0000 Received: by outflank-mailman (input) for mailman id 138036; Mon, 07 Jun 2021 15:16:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqGzK-0005TN-JD for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqGzK-0002az-IR for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:26 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1lqGzK-0001kT-HE for xen-devel@lists.xenproject.org; Mon, 07 Jun 2021 15:16:26 +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 1lqGzI-0000i8-Sc; Mon, 07 Jun 2021 16:16:24 +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: Message-Id:Date:Subject:Cc:To:From; bh=GD3Qo7Umq5wiIJdpIbajB6oXYpu0bAtv9S8Selleh/I=; b=AhAWnSh297aJHkdksWgIWTAhq8 WsbSlZ22pcx2XWjPI1csdR5bzRYhQbwtg/m+Wl3qSDG27qYzuPIf5UN7FZKAaNIvh2uXD8cTqJSZA uIi8zTkzLDDk+iT/Z3WkrbE17pd9MVTeWbrJMP68Ac0Oe2nHwmQtJUrqghEetM/R8cNU=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/3] host allocation: Prepare for further starvation check Date: Mon, 7 Jun 2021 16:16:12 +0100 Message-Id: <20210607151614.14132-1-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit * Add a new job pattern parameter to $starvation_q * Add a new $thisclass parameter to starving * Pass 0 for now. Signed-off-by: Ian Jackson --- ts-hosts-allocate-Executive | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive index 459b9215..9722ce12 100755 --- a/ts-hosts-allocate-Executive +++ b/ts-hosts-allocate-Executive @@ -162,6 +162,7 @@ END LEFT JOIN steps USING (flight,job) WHERE flight= ? + AND job LIKE ? GROUP BY job, jobs.status END @@ -822,11 +823,12 @@ sub most_optimistic ($$$) { return $optimist->{Got}; } -sub starving ($$) { - my ($best_start_abs, $now) = @_; +sub starving ($$$) { + my ($best_start_abs, $now, $thisclass) = @_; return (0, 'runvar says never give up') unless %$starvation_p; return (0, 'no estimate') unless defined $best_start_abs; - $starvation_q->execute($flight); + my $joblike = $thisclass ? ($job =~ s/(?:(-)|\W).*/$1\%/r) : '%'; + $starvation_q->execute($flight, $joblike); my $d=0; my $w=0; my $maxfin=0; @@ -935,7 +937,7 @@ sub attempt_allocation { } } elsif (%$starvation_p) { my $est_abs = most_optimistic($best, $now, $starvation_p->{I}); - my ($starving, $m) = starving($est_abs, $now); + my ($starving, $m) = starving($est_abs, $now, 0); $starvation_q->finish(); if (!$starving) { print DEBUG "not starving: $m\n"; -- 2.20.1