power: refuse to set power state for shared hosts (fix)

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index e626b06b7f34070d715204e499d47dbfb58a272d..d2b1694eee63565935047d2d2c8999ee7dca877d 100644 (file)
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -123,9 +123,11 @@ END
 sub host_check_allocated ($$) { #method
     my ($jd, $ho) = @_;
     $ho->{Shared}= resource_check_allocated('host', $ho->{Name});
-    $ho->{SharedReady}=
+    $ho->{SharedMaybeOthers}=
         $ho->{Shared} &&
-        $ho->{Shared}{State} eq 'ready' &&
+        $ho->{Shared}{State} eq 'ready';
+    $ho->{SharedReady}=
+       $ho->{SharedMaybeOthers} &&
         !! (grep { $_ eq "share-".$ho->{Shared}{Type} }
            get_hostflags($ho->{Ident}));
     $ho->{SharedOthers}=

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 255bbe2bf1e593b25b98a129739058dd36092c93..9fe07949ac9f81b27cb8d4409d8054e47dcbf75c 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -634,8 +634,9 @@ sub power_cycle_time ($) {
 sub power_cycle ($) {
     my ($ho) = @_;
     $mjobdb->host_check_allocated($ho);
-    die "refusing to set power state for host $ho->{Name} shared with others\n"
-       if $ho->{SharedOthers};
+    die "refusing to set power state for host $ho->{Name}".
+       " possibly shared with other jobs\n"
+       if $ho->{SharedMaybeOthers};
     power_state($ho, 0);
     sleep(power_cycle_time($ho));
     power_state($ho, 1);