[Xen-devel] [OSSTEST PATCH 25/29] Manual allocation: Break out manual_allocation_base_jobinfo from mg-blockage

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

This is called `jobinfo' because it ought to be used in
alloc_resources's JobInfo xparam, rather than an Xinfo in the booking:
JobInfo is per planning client; Xinfo is per individual resource.

mg-blockage currently gets this wrong; we will fix that shortly.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
v2: New patch
---
 Osstest/Executive.pm |    7 +++++++
 mg-blockage          |    5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 4f51d70..1efcfd4 100644
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -51,6 +51,7 @@ BEGIN {
                       report_altchangecolour
                       report_blessingscond report_find_push_age_info
                       tcpconnect_queuedaemon plan_search
+                      manual_allocation_base_jobinfo
                       alloc_resources alloc_resources_rollback_begin_work
                       resource_check_allocated resource_shared_mark_ready
                       duration_estimator
@@ -494,6 +495,12 @@ END
     return $taskid;
 }        
 
+sub manual_allocation_base_jobinfo () {
+    my $whoami = `whoami`; chomp $whoami;
+    my $hostname = `uname -n`; chomp $hostname;
+    return "$whoami\@$hostname";
+}
+
 sub alloc_resources_rollback_begin_work () {
     $dbh_tests->rollback();
     db_begin_work($dbh_tests, \@all_lock_tables);
diff --git a/mg-blockage b/mg-blockage
index 1f66d8e..0286c27 100755
--- a/mg-blockage
+++ b/mg-blockage
@@ -24,9 +24,8 @@ sub parsedate ($) {
     return $r;
 }
 
-my $whoami = `whoami`; chomp $whoami;
-my $hostname = `uname -n`; chomp $hostname;
-my $xinfo = "blockage $whoami\@$hostname [$start .. $end]";
+my $basexinfo = manual_allocation_base_joinfo();
+my $xinfo = "blockage $basexinfo [$start .. $end]";
 $xinfo .= " $mxinfo" if defined $mxinfo;
 
 $start = parsedate $start;
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel