svn commit: r1628726 - in /vcl/trunk/managementnode/lib/VCL/Module/Predictive: Level_0.pm Level_1.pm Level_2.pm

[fapeeler]

Author: fapeeler
Date: Wed Oct  1 14:59:37 2014
New Revision: 1628726

URL: http://svn.apache.org/r1628726
Log:
VCL-170

corrected return values if node is in block allocation

Modified:
    vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_0.pm
    vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_1.pm
    vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_2.pm

Modified: vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_0.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_0.pm?rev=1628726&r1=1628725&r2=1628726&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_0.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_0.pm Wed Oct  1 
14:59:37 2014
@@ -89,6 +89,7 @@ sub get_next_image {
        my $current_imagerevision_id = $self->data->get_imagerevision_id();
        
        my $notify_prefix = "predictive_reload_Level_0: ";
+       my @ret_array;
        
        notify($ERRORS{'OK'}, 0, "$notify_prefix for $computer_id");
        
@@ -98,7 +99,8 @@ sub get_next_image {
                my @block_ret_array = 
get_block_request_image_info($computer_id);
                
                if (defined($block_ret_array[0]) && $block_ret_array[0]) {
-                       return @block_ret_array;
+                        push(@ret_array, "reload", @block_ret_array);
+                   return @ret_array;
                }
                else{
                        notify($ERRORS{'WARNING'}, 0, "computer $computer_id is 
part of blockComputers, failed to return image info"); 
@@ -129,7 +131,6 @@ sub get_next_image {
        # Call the database select subroutine
        # This will return an array of one or more rows based on the select 
statement
        my @selected_rows = database_select($select_statement);
-       my @ret_array;
        
        # Check to make sure 1 or more rows were returned
        if (scalar @selected_rows > 0) {

Modified: vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_1.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_1.pm?rev=1628726&r1=1628725&r2=1628726&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_1.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_1.pm Wed Oct  1 
14:59:37 2014
@@ -95,7 +95,8 @@ sub get_next_image {
                notify($ERRORS{'DEBUG'}, 0, "computer id $computer_id is in 
blockComputers table");
                my @block_ret_array = 
get_block_request_image_info($computer_id);
                if (defined($block_ret_array[0]) && $block_ret_array[0]) {
-                       return @block_ret_array;
+                       push(@ret_array, "reload", @block_ret_array);
+                       return @ret_array;
                }
                else{
                        notify($ERRORS{'WARNING'}, 0, "computer $computer_id is 
part of blockComputers, failed to return image info"); 

Modified: vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_2.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_2.pm?rev=1628726&r1=1628725&r2=1628726&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_2.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Predictive/Level_2.pm Wed Oct  1 
14:59:37 2014
@@ -96,10 +96,9 @@ sub get_next_image {
                notify($ERRORS{'DEBUG'}, 0, "computer id $computer_id is in 
blockComputers table");
                my @block_ret_array = 
get_block_request_image_info($computer_id);
 
-               push(@ret_array, "reload", @block_ret_array);   
-
                if(defined($block_ret_array[0]) && $block_ret_array[0]){
-                       return @block_ret_array;
+                       push(@ret_array, "reload", @block_ret_array);   
+                       return @ret_array;
                }
                else{
                        notify($ERRORS{'WARNING'}, 0, "computer $computer_id is 
part of blockComputers, failed to return image info");