Author: arkurth Date: Wed Nov 18 15:08:38 2009 New Revision: 881796 URL: http://svn.apache.org/viewvc?rev=881796&view=rev Log: VCL-266 Removed check for 'loadimagecomplete' computerloadlog entry in monitorloading subroutine. It now only checks for 'nodeready'. The 'loadimagecomplete' entry is created before the OS module's post_load() subroutine is called. As a result, monitorloading was returning true before the load was entirely done.
Added OS.moduleid to data returned by get_request_info(). This column was missing. Changed '&' to '&&' in write_currentimage_txt() where echo and cat commands are chained together. Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=881796&r1=881795&r2=881796&view=diff ============================================================================== --- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original) +++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Wed Nov 18 15:08:38 2009 @@ -4556,8 +4556,8 @@ } } if (!$s8) { - if ($row[0] =~ /loadimagecomplete|nodeready/) { - notify($ERRORS{'OK'}, 0, "detected $row[0] returning to calling process"); + if ($row[0] =~ /nodeready/) { + notify($ERRORS{'OK'}, 0, "detected $row[0] for $nodename, returning to calling process"); $s8 = 1; #ready to return return 1; @@ -4999,6 +4999,7 @@ OS.type AS OS_type, OS.installtype AS OS_installtype, OS.sourcepath AS OS_sourcepath, + OS.moduleid AS OS_moduleid, imageOSmodule.name AS imageOSmodule_name, imageOSmodule.prettyname AS imageOSmodule_prettyname, @@ -6501,7 +6502,7 @@ notify($ERRORS{'OK'}, 0, "updated ownership and permissions on currentimage.txt"); } - my $command = 'echo -e "' . $current_image_contents . '" > currentimage.txt & cat currentimage.txt'; + my $command = 'echo -e "' . $current_image_contents . '" > currentimage.txt && cat currentimage.txt'; # Copy the temp file to the node as currentimage.txt my ($ssh_exit_status, $ssh_output) = run_ssh_command($computer_node_name, $image_identity, $command);