| Message ID | 1451926178-10812-3-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2016-01-04 at 16:49 +0000, Ian Jackson wrote: > When ms-queuedaemon generates a resource-projection.html, it sometimes > does so from data-plan.pl (see proc report-plan). This means that > ms-planner does not get a reliable indication of whether it is being > run for the plan or the projection, and the resource-project.html > sometimes claims to be the plan. > > Fix with a new ms-planner option -W which tells it what to put in the > title, defaulting to the value passed to -w. > > DEPLOYMENT NOTE: > > The new ms-planner works with the old queuedaemon, so when upgrading, > it is OK to simply update the daemons-testing.git and then restart the > ms-queuedaemon. > > If it is necessary to downgrade, rewinding to the old commit with a > running ms-queuedaemon will cause errors from the old ms-planner being > passed -w -- but these errors are trapped and ignored. So in this > case reports will be out of datte until ms-queuedaemon is also "date" (but I expect you will remove this on commit anyway?) > restarted. > > In either case nothing will go badly wrong. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Ian Campbell writes ("Re: [OSSTEST PATCH 2/2] ms-* html generation: Provide right title for projection"):
> On Mon, 2016-01-04 at 16:49 +0000, Ian Jackson wrote:
> > DEPLOYMENT NOTE:
...
> > If it is necessary to downgrade, rewinding to the old commit with a
> > running ms-queuedaemon will cause errors from the old ms-planner being
> > passed -w -- but these errors are trapped and ignored. So in this
> > case reports will be out of datte until ms-queuedaemon is also
>
> "date" (but I expect you will remove this on commit anyway?)
Fixed. I think we should leave these in for the benefit of anyone
else...
Ian.
diff --git a/ms-planner b/ms-planner index 7ce0405..6f4a511 100755 --- a/ms-planner +++ b/ms-planner @@ -34,6 +34,7 @@ use Osstest::Executive; open DEBUG, ">/dev/null" or die $!; our $walker = 'plan'; +our $walker_show; while (@ARGV and $ARGV[0] =~ m/^-/) { $_= shift @ARGV; @@ -43,12 +44,16 @@ while (@ARGV and $ARGV[0] =~ m/^-/) { open DEBUG, ">&STDERR" or die $!; } elsif (s/^-w(.+)/-/) { $walker = $1; + } elsif (s/^-W(.+)/-/) { + $walker_show = $1; } else { die "$_ ?"; } } } +$walker_show //= $walker; + csreadconfig(); our ($plan); @@ -688,7 +693,7 @@ sub cmd_show_html () { # Dumper(\@rows, \@newoutcols); printf "<html><head><title>Resource %s - %s</title></head><body>\n", - $walker, ($c{DnsDomain} // '?'); + $walker_show, ($c{DnsDomain} // '?'); printf "<table rules=all><tr><td>plan age %s</td><td>report at %s</td>\n", show_rel_time($now); diff --git a/ms-queuedaemon b/ms-queuedaemon index 08f88cf..2b8d621 100755 --- a/ms-queuedaemon +++ b/ms-queuedaemon @@ -301,7 +301,7 @@ proc report-plan {w wo} { global c catching-internally "showing $w html" { set outputfile "$c(WebspaceFile)/resource-$wo.html" - exec ./ms-planner -w$w show-html > $outputfile + exec ./ms-planner -w$w -W$wo show-html > $outputfile } { set out data-$wo.final.pl file copy -force data-$w.pl $out.new
When ms-queuedaemon generates a resource-projection.html, it sometimes does so from data-plan.pl (see proc report-plan). This means that ms-planner does not get a reliable indication of whether it is being run for the plan or the projection, and the resource-project.html sometimes claims to be the plan. Fix with a new ms-planner option -W which tells it what to put in the title, defaulting to the value passed to -w. DEPLOYMENT NOTE: The new ms-planner works with the old queuedaemon, so when upgrading, it is OK to simply update the daemons-testing.git and then restart the ms-queuedaemon. If it is necessary to downgrade, rewinding to the old commit with a running ms-queuedaemon will cause errors from the old ms-planner being passed -w -- but these errors are trapped and ignored. So in this case reports will be out of datte until ms-queuedaemon is also restarted. In either case nothing will go badly wrong. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- ms-planner | 7 ++++++- ms-queuedaemon | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)