Author: arkurth
Date: Wed Dec 12 17:41:18 2012
New Revision: 1420869
URL: http://svn.apache.org/viewvc?rev=1420869&view=rev
Log:
VCL-657
Updated calls to get_vmhost_profile_repository_path to not display a warning in
vcld.log if not set in the VM profile.
VCL-656
Updated VIM_SSH.pm to timeout after 7200 seconds instead of 30 when removing
snapshots from a VM. This process merges delta vmdk files into the parent and
may take a long time.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm?rev=1420869&r1=1420868&r2=1420869&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm Wed Dec 12 17:41:18
2012
@@ -249,7 +249,7 @@ sub get_image_repository_search_paths {
push @search_paths,
"$management_node_install_path/vmware_images/$image_name*";
}
- my $vmhost_profile_repository_path =
$self->data->get_vmhost_profile_repository_path();
+ my $vmhost_profile_repository_path =
$self->data->get_vmhost_profile_repository_path(0);
push @search_paths, "$vmhost_profile_repository_path/$image_name*" if
$vmhost_profile_repository_path;
return @search_paths;
@@ -320,7 +320,7 @@ sub retrieve_image {
$image_repository_path_local =
$self->get_image_repository_directory_path();
}
else {
- $image_repository_path_local =
$self->data->get_vmhost_profile_repository_path();
+ $image_repository_path_local =
$self->data->get_vmhost_profile_repository_path(0);
}
if (!$image_repository_path_local) {
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm?rev=1420869&r1=1420868&r2=1420869&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm Wed
Dec 12 17:41:18 2012
@@ -145,7 +145,7 @@ sub initialize {
=head2 _run_vim_cmd
- Parameters : $vim_arguments
+ Parameters : $vim_arguments, $timeout_seconds (optional)
Returns : array ($exit_status, $output)
Description : Runs VIM command on the VMware host.
@@ -164,6 +164,8 @@ sub _run_vim_cmd {
return;
}
+ my $timeout_seconds = shift || 30;
+
my $vmhost_computer_name =
$self->vmhost_os->data->get_computer_short_name();
my $command = "$self->{vim_cmd} $vim_arguments";
@@ -192,7 +194,7 @@ sub _run_vim_cmd {
$self->{vim_cmd_calls}++;
#notify($ERRORS{'DEBUG'}, 0, "vim-cmd call count:
$self->{vim_cmd_calls} ($vim_arguments)");
- my ($exit_status, $output) =
$self->vmhost_os->execute($command);
+ my ($exit_status, $output) =
$self->vmhost_os->execute($command, 0, $timeout_seconds);
if (!defined($output)) {
notify($ERRORS{'WARNING'}, 0, "attempt
$attempt/$attempt_limit: failed to run VIM command on VM host
$vmhost_computer_name: $command");
}
@@ -1765,7 +1767,7 @@ sub remove_snapshots {
}
my $vim_cmd_arguments = "vmsvc/snapshot.removeall $vm_id";
- my ($exit_status, $output) = $self->_run_vim_cmd($vim_cmd_arguments);
+ my ($exit_status, $output) = $self->_run_vim_cmd($vim_cmd_arguments,
7200);
return if !$output;
notify($ERRORS{'DEBUG'}, 0, "remove snapshots output:\n" . join("\n",
@$output));
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1420869&r1=1420868&r2=1420869&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Wed
Dec 12 17:41:18 2012
@@ -4132,7 +4132,7 @@ sub get_repository_vmdk_base_directory_p
}
# Attempt the retrieve vmhost.repositorypath
- my $repository_vmdk_base_directory_path =
$self->data->get_vmhost_profile_repository_path();
+ my $repository_vmdk_base_directory_path =
$self->data->get_vmhost_profile_repository_path(0);
if (!$repository_vmdk_base_directory_path) {
notify($ERRORS{'DEBUG'}, 0, "repository path is not configured
in the VM profile");
return;
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm?rev=1420869&r1=1420868&r2=1420869&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm Wed Dec 12
17:41:18 2012
@@ -1249,7 +1249,7 @@ sub get_repository_image_directory_path
}
my $image_name = shift || $self->data->get_image_name();
- my $vmhost_repository_directory_path =
$self->data->get_vmhost_profile_repository_path();
+ my $vmhost_repository_directory_path =
$self->data->get_vmhost_profile_repository_path(0);
if ($vmhost_repository_directory_path) {
return "$vmhost_repository_directory_path/$image_name";
@@ -2257,7 +2257,7 @@ sub find_repository_image_file_paths {
return @{$self->{repository_file_paths}{$image_name}} if
$self->{repository_file_paths}{$image_name};
my $node_name = $self->data->get_vmhost_short_name();
- my $vmhost_repository_directory_path =
$self->data->get_vmhost_profile_repository_path();
+ my $vmhost_repository_directory_path =
$self->data->get_vmhost_profile_repository_path(0);
if (!$vmhost_repository_directory_path) {
notify($ERRORS{'DEBUG'}, 0, "repository path is not configured
in the VM host profile for $node_name");
