cs-adjust-flight: Provide runvar-set-default
PATCH 1/3 cs-adjust-flight: Provide runvar-set-default
No change to existing code.
--- cs-adjust-flight | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
cs-adjust-flight +27 -0
@@ -11,6 +11,7 @@ # jobs-list <job-spec> # jobs-del <job-spec> # runvar-set <job-spec> <var-spec> <value> +# runvar-set-default <job-spec> <var-spec> <value> # runvar-del <job-spec> <var-spec> # runvar-change <job-spec> <var-spec> <old-value> <new-value> # runvar-perlop <job-spec> <var-spec> <perl-expr>
@@ -260,6 +261,10 @@ our $runvar_rm_q = db_prepare our $runvar_insert_q = db_prepare ("INSERT INTO runvars (flight, job, name, val, synth)". " VALUES (?, ?, ?, ?, 'f')"); +our $runvar_insert_default_q = db_prepare + ("INSERT INTO runvars (flight, job, name, val, synth)". + " VALUES (?, ?, ?, ?, 'f')". + " ON CONFLICT DO NOTHING"); sub runvar_set ($$$;$) { my ($job, $name, $val, $xwhat) = @_;
@@ -270,6 +275,16 @@ sub runvar_set ($$$;$) { verbose "\n"; } +sub runvar_set_default ($$$;$) { + my ($job, $name, $val, $xwhat) = @_; + my $y = $runvar_insert_default_q->execute($dstflight, $job, $name, $val); + if ($y) { + verbose "$dstflight.$job $name := \`$val'"; + verbose $xwhat if defined $xwhat; + verbose "\n"; + } +} + sub for_runvars ($$$$) { my ($jobspec, $varspec, $fn, $ifnone) = @_; # calls $fn->($jobname, $varname, $varrow)
@@ -306,6 +321,18 @@ sub change__runvar_set { }, 'ANYWAY'); } +sub change__runvar_set_default { + die unless @changes >= 3; + my $jobs = shift @changes; + my $name = shift @changes; + my $val = shift @changes; + + for_jobs($dstflight, $jobs, sub { + my ($job) = @_; + runvar_set_default($job, $name, $val); + }, 'ANYWAY'); +} + sub change__runvar_del { die unless @changes >= 2; my $jobs = shift @changes;
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/3 guest_prepare_disk: Only do the umount if we set an env var
This call to guest_umount_lv is here for the benefit of ad-hoc reruns of (eg) ts-guest-start tidy up any ad-hoc messing about (eg from earlier runs of ts-debian-fixup or something). It is not needed in production runs.
Serendipitously, this osstest code discovered a bug in the Linux
blkback: when tearing down, it sets the backend state to 6 before it has closed the underlying block devices. This ultimately means that after "xl destroy" or "xl shutdown -w" there is a period when the guest's open handle onto its storage is still open. This is wrong.
This detection depends on us winning a tricky race. So it shows up in osstest as a very low probability heisenbug. The bug is currently in all versions of Linux and causing a bit of a nuisance.
It would be best to add a proper check for this bug. However, this is quite fiddly: really, it ought to be done as close to the xl command completion as possible, in the same ssh invocation. That would involve a fair bit of plumbing and ad-hocery. I don't think that would be proportionate for such a low-impact bug.
So instead in this patch I just disable this cleanup code in the troublesome case, unless it is explicitly requested by the user setting OSSTEST_GUEST_DISK_MOUNT_CLEANUP to a trueish value. (This would be reasonably convenient for the ad-hoc testing that this call serves.)
Thanks to Roger for diagnosing the Linux kernel bug.
--- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Osstest/TestSupport.pm +2 -1
@@ -1938,7 +1938,8 @@ sub guest_create_paused ($) { sub guest_prepare_disk ($) { my ($gho) = @_; - guest_umount_lv($gho->{Host}, $gho); + guest_umount_lv($gho->{Host}, $gho) + if $ENV{'OSSTEST_GUEST_DISK_MOUNT_CLEANUP'}; return if ($gho->{Diskfmt} // 'none') eq "none";
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 3/3 Toolstack/xl: Wrap a long command
In reply to Ian JacksonNo functional change.
--- Osstest/Toolstack/xl.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Osstest/Toolstack/xl.pm +2 -1
@@ -78,7 +78,8 @@ sub shutdown_wait ($$$) { my $gn = $gho->{Name}; my $acpi_fallback = guest_var($gho,'acpi_shutdown','false') eq 'true' && $self->{Name} eq 'xl' ? "F" : ""; - target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", $timeout); + target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", + $timeout); } sub _check_for_command($$) {
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel