From 85dcdb2370412321a190742d3312b44574e49c32 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 17 Oct 2013 15:35:52 +0100 Subject: [PATCH] Executive: properly rewind allocations in all cases of queue-server trouble; also improve unwinding message --- Osstest/Executive.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 9627036c..ac7b7341 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -474,8 +474,6 @@ sub alloc_resources { print $qserv $jbookings or die $!; $_= <$qserv>; defined && m/^OK book-resources\s/ or die "$_ ?"; - $bookinglist= undef; # no need to undo these then - logm("resource allocation: we are in the plan."); } @@ -507,7 +505,8 @@ sub alloc_resources { my @reskey= ((split / /, $book->{Reso}, 2), $alloc->{Shareix}); $reskey[0]= "share-$reskey[0]" if $reskey[2]; - logm("resource allocation: unwinding @reskey"); + logm("resource allocation: unwinding ". + join '/', @reskey); my $undone= $dbh_tests->do(<