From patchwork Wed Mar 11 17:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11432363 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 5FC8B14B7 for ; Wed, 11 Mar 2020 17:22:29 +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 0769620746 for ; Wed, 11 Mar 2020 17:22:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="X38EqW4V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0769620746 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC526-0002zC-3i; Wed, 11 Mar 2020 17:20:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC525-0002z7-60 for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 17:20:37 +0000 X-Inumbo-ID: 9ef52f8a-63bc-11ea-a6c1-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9ef52f8a-63bc-11ea-a6c1-bc764e2007e4; Wed, 11 Mar 2020 17:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583947236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ull+dy34N/MPjwzwky5Fi1qaIR1ACu8/L8uLhFr4S0k=; b=X38EqW4VQyt9HUOQI6pz3EXUGVm8VNe0LJrdigOqoqI4tNu8PfC/5fNB ElxssXzL0JWSugEhzkLjQSZ/OofbaIcyxDOdYk2uqbi9AQ/ixmWCt92u4 EcVjRIzotV+cIMqKL4IaHdIswVs7nEgItD3VC6v8GtYe36kvw6NNwW3J1 4=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 9A5CT1XPAqn22yzNo8yTIgTiJhOA1WuYw0KGmvCc7Q1QM8EUa9OBelPaYuRlJhwWcAylnkiWhk 5lbMrI5UD/SZgSPW8lCVq1FueAvl4Vo5tlHIih9kaZJQSwfKuY/Yt0P8E6I3XS0mCLyFS3k9VF yV3H2/AsOJNss2qSQX56XwDgS+otcTOAf7nkVteQPEelPktKU06yA+OtkUCBSeUZZJCpr4IQS1 G46U6Y9w5NFG6xhyv2TSkVSNSZzDU2GOD4i3izWGUkYnvmAEpCdcVtYCOeS+rgTO8QMLjwfOSz 3ss= X-SBRS: 2.7 X-MesageID: 14418290 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="14418290" From: Roger Pau Monne To: Date: Wed, 11 Mar 2020 18:20:07 +0100 Message-ID: <20200311172010.7777-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200311172010.7777-1-roger.pau@citrix.com> References: <20200311172010.7777-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v5 3/5] ts-examine-hostprops-save: record hostflags also X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: ian.jackson@eu.citrix.com, Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Commit putative hotflags into the database if present on the runvars. Signed-off-by: Roger Pau Monné Reviewed-by: Ian Jackson --- Changes since v4: - New in this version. --- Requested by Ian on IRC: 17:08:58 Diziet royger: I think your ts-examine-hostprops-save hunk in 2/ belongs in 1/ ? (Or in a separate 1.5/ along with hostflag_putative_record.) --- Osstest/TestSupport.pm | 8 +++++++- ts-examine-hostprops-save | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ceb6bb7b..1c13e2af 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -86,7 +86,7 @@ BEGIN { power_state power_cycle power_reboot_attempts serial_fetch_logs set_host_property modify_host_flag propname_massage propname_check - hostprop_putative_record + hostprop_putative_record hostflag_putative_record get_stashed open_unique_stashfile compress_stashed dir_identify_vcs @@ -1417,6 +1417,12 @@ sub modify_host_flag ($$$) { $mhostdb->modify_flag($ho, $flag, $set); } +sub hostflag_putative_record ($$$) { + my ($ho, $prop, $set) = @_; + + store_runvar("hostflag/$ho->{Ident}/$prop", !!$set); +} + sub get_target_property ($$;$); sub get_target_property ($$;$) { my ($ho, $prop, $defval) = @_; diff --git a/ts-examine-hostprops-save b/ts-examine-hostprops-save index 55d23392..e50ea7fb 100755 --- a/ts-examine-hostprops-save +++ b/ts-examine-hostprops-save @@ -27,20 +27,25 @@ tsreadconfig(); our $blessing = intended_blessing(); -logm("setting host properties"); +logm("setting host properties and flags"); # NB: in order to aid debug only attempt to save the host props on flights # with intended real blessing, for the rest just do a dry run. our $dry_run = $blessing ne "real"; -logm("not saving host props with intended blessing $blessing != real") +logm("not saving host props/flags with intended blessing $blessing != real") if $dry_run; foreach my $k (sort keys %r) { - next unless $k =~ m/^hostprop\/([^\/]*)\/([^\/]*)$/; - my $ho = selecthost($1); - my $prop = $2; - - logm("recording for $ho->{Name} $prop=$r{$k}"); - - set_host_property($ho, $prop, $r{$k}) if !$dry_run; + next unless $k =~ m/^host(prop|flag)\/([^\/]*)\/([^\/]*)$/; + my $type = $1; + my $ho = selecthost($2); + my $prop = $3; + + if ($type eq "flag") { + logm("recording flag $prop set: $r{$k} for $ho->{Name}"); + modify_host_flag($ho, $prop, !!$r{$k}) if !$dry_run; + } else { + logm("recording prop for $ho->{Name} $prop=$r{$k}"); + set_host_property($ho, $prop, $r{$k}) if !$dry_run; + } }