[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[OSSTEST PATCH 20/82] ts-hosts-allocate-Executive: Fix handling of failed preps for same sharing



From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

This code was previously unreachable.  It ought to be executed when
all the shares are allocatable or prep: in that case, we can unshare
and re-share the host.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 ts-hosts-allocate-Executive | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive
index 78b94c6d..2c18a739 100755
--- a/ts-hosts-allocate-Executive
+++ b/ts-hosts-allocate-Executive
@@ -1044,12 +1044,11 @@ sub actual_allocation ($) {
                # now-dead task.  If so that share will become allocatable
                # (and therefore not be counted in `ntasks') in due course.
                return undef;
-
-                # someone was preparing it but they aren't any more
-                push @allocwarnings,
-                    "previous preparation apparently abandoned";
-                $allocatable= 1;
-            }
+           }
+           # someone was preparing it but they aren't any more
+           push @allocwarnings,
+               "previous preparation apparently abandoned";
+           $allocatable= 1;
         }
     }
 
-- 
2.20.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.