You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2009/09/04 19:49:24 UTC
svn commit: r811504 - in
/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning: vmware.pm
xCAT.pm
Author: arkurth
Date: Fri Sep 4 17:49:23 2009
New Revision: 811504
URL: http://svn.apache.org/viewvc?rev=811504&view=rev
Log:
VCL-192
Commented out section in does_image_exist where it is checking if an SCP process is currently running to retrieve the image. There is a bug in this section which is causing reservations to loop unnecessarily and fail.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm?rev=811504&r1=811503&r2=811504&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm Fri Sep 4 17:49:23 2009
@@ -2011,22 +2011,22 @@
# [root@mn]# pgrep -fl "scp.*winxp-base1-v27\* /install/image/x86"
# 32578 sh -c /usr/bin/scp -B -i /etc/vcl/vcl.key -P 22 -p -r vcl@10.1.1.1:/install/image/x86/winxp-base1-v27* /install/image/x86 2>&1
# 32579 /usr/bin/scp -B -i /etc/vcl/vcl.key -P 22 -p -r vcl 10.1.1.1 /install/image/x86/winxp-base1-v27* /install/image/x86
- my $scp_wait_attempt = 0;
- my $scp_wait_max_attempts = 40;
- my $scp_wait_delay = 15;
- while (is_management_node_process_running('scp.*$image_name\* $image_repository_path')) {
- $scp_wait_attempt++;
-
- notify($ERRORS{'OK'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: scp process is running to retrieve $image_name, waiting for $scp_wait_delay seconds");
-
- if ($scp_wait_attempt == $scp_wait_max_attempts) {
- notify($ERRORS{'WARNING'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: waited maximum amount of time for scp process to terminate to retrieve $image_name");
- return;
- }
-
- sleep $scp_wait_delay;
- }
- notify($ERRORS{'DEBUG'}, 0, "scp process is not running to retrieve $image_name");
+ #my $scp_wait_attempt = 0;
+ #my $scp_wait_max_attempts = 40;
+ #my $scp_wait_delay = 15;
+ #while (is_management_node_process_running('scp.*$image_name\* $image_repository_path')) {
+ # $scp_wait_attempt++;
+ #
+ # notify($ERRORS{'OK'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: scp process is running to retrieve $image_name, waiting for $scp_wait_delay seconds");
+ #
+ # if ($scp_wait_attempt == $scp_wait_max_attempts) {
+ # notify($ERRORS{'WARNING'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: waited maximum amount of time for scp process to terminate to retrieve $image_name");
+ # return;
+ # }
+ #
+ # sleep $scp_wait_delay;
+ #}
+ #notify($ERRORS{'DEBUG'}, 0, "scp process is not running to retrieve $image_name");
# Run du to get the size of the image files if the image exists
my $du_command = "du -c $image_repository_path/*$image_name* 2>&1 | grep total 2>&1";
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=811504&r1=811503&r2=811504&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Fri Sep 4 17:49:23 2009
@@ -2718,22 +2718,22 @@
# [root@mn]# pgrep -fl "scp.*winxp-base1-v27\* /install/image/x86"
# 32578 sh -c /usr/bin/scp -B -i /etc/vcl/vcl.key -P 22 -p -r vcl@10.1.1.1:/install/image/x86/winxp-base1-v27* /install/image/x86 2>&1
# 32579 /usr/bin/scp -B -i /etc/vcl/vcl.key -P 22 -p -r vcl 10.1.1.1 /install/image/x86/winxp-base1-v27* /install/image/x86
- my $scp_wait_attempt = 0;
- my $scp_wait_max_attempts = 40;
- my $scp_wait_delay = 15;
- while (is_management_node_process_running('scp.*$image_name\* $image_repository_path')) {
- $scp_wait_attempt++;
-
- notify($ERRORS{'OK'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: scp process is running to retrieve $image_name, waiting for $scp_wait_delay seconds");
-
- if ($scp_wait_attempt == $scp_wait_max_attempts) {
- notify($ERRORS{'WARNING'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: waited maximum amount of time for scp process to terminate to retrieve $image_name");
- return;
- }
-
- sleep $scp_wait_delay;
- }
- notify($ERRORS{'DEBUG'}, 0, "scp process is not running to retrieve $image_name");
+ #my $scp_wait_attempt = 0;
+ #my $scp_wait_max_attempts = 40;
+ #my $scp_wait_delay = 15;
+ #while (is_management_node_process_running('scp.*$image_name\* $image_repository_path')) {
+ # $scp_wait_attempt++;
+ #
+ # notify($ERRORS{'OK'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: scp process is running to retrieve $image_name, waiting for $scp_wait_delay seconds");
+ #
+ # if ($scp_wait_attempt == $scp_wait_max_attempts) {
+ # notify($ERRORS{'WARNING'}, 0, "attempt $scp_wait_attempt/$scp_wait_max_attempts: waited maximum amount of time for scp process to terminate to retrieve $image_name");
+ # return;
+ # }
+ #
+ # sleep $scp_wait_delay;
+ #}
+ #notify($ERRORS{'DEBUG'}, 0, "scp process is not running to retrieve $image_name");
# Run du to get the size of the image files if the image exists
my $du_command;