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 C4560C4727E for ; Wed, 7 Oct 2020 18:27:22 +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 662702168B for ; Wed, 7 Oct 2020 18:27:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 662702168B 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.3690.10846 (Exim 4.92) (envelope-from ) id 1kQE9g-0001sB-3E; Wed, 07 Oct 2020 18:27:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3690.10846; Wed, 07 Oct 2020 18:27:11 +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 1kQE9e-0001ql-VR; Wed, 07 Oct 2020 18:27:10 +0000 Received: by outflank-mailman (input) for mailman id 3690; Wed, 07 Oct 2020 18:27:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE6s-00072Q-Ro for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:24:18 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6a26448e-ebaa-49d8-a387-8b29faaad382; Wed, 07 Oct 2020 18:21:56 +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 1kQDk2-0007CF-Gl; Wed, 07 Oct 2020 19:00:42 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE6s-00072Q-Ro for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:24:18 +0000 X-Inumbo-ID: 6a26448e-ebaa-49d8-a387-8b29faaad382 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6a26448e-ebaa-49d8-a387-8b29faaad382; Wed, 07 Oct 2020 18:21:56 +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 1kQDk2-0007CF-Gl; Wed, 07 Oct 2020 19:00:42 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 36/82] resource reporting, nfc: Break out report_rogue_task_description Date: Wed, 7 Oct 2020 18:59:38 +0100 Message-Id: <20201007180024.7932-37-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 Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 14 ++++++++++++++ ms-planner | 6 +----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 5f59c44e..e3ab1dc3 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -51,6 +51,7 @@ BEGIN { report_run_getinfo report_altcolour report_altchangecolour opendb_tests report_blessingscond report_find_push_age_info + report_rogue_task_description log_stderr_timestamped tcpconnect_queuedaemon plan_search manual_allocation_base_jobinfo @@ -418,6 +419,19 @@ sub report_blessingscond ($) { return $blessingscond; } +sub report_rogue_task_description ($) { + my ($arow) = @_; + # should have the fields from tasks, except taskid which + # caller must print if they want it. + # may also have fields from resources (eg subtask) + my $info= "rogue task "; + $info .= " $arow->{type} $arow->{refkey}"; + $info .= " ($arow->{comment})" if defined $arow->{comment}; + $info .= " $arow->{subtask}"; + $info .= " (user $arow->{username})"; + return $info; +} + sub report__find_test ($$$$$$$) { my ($blessings, $branches, $tree, $revision, $selection, $extracond, $sortlimit) = @_; diff --git a/ms-planner b/ms-planner index 41f27fa0..4b970730 100755 --- a/ms-planner +++ b/ms-planner @@ -321,11 +321,7 @@ END $info= "(preparing)"; } else { print DEBUG "rogue $reso $shareix: $arow->{owntaskid}\n"; - $info= "rogue task"; - $info .= " $arow->{type} $arow->{refkey}"; - $info .= " ($arow->{comment})" if defined $arow->{comment}; - $info .= " $arow->{subtask}"; - $info .= " (user $arow->{username})"; + $info= report_rogue_task_description($arow); } $plan->{Allocations}{$reskey}= { Task => $arow->{owntaskid}, -- 2.20.1