Author: arkurth
Date: Mon Apr 15 13:41:32 2013
New Revision: 1468059
URL: http://svn.apache.org/r1468059
Log:
VCL-688
Added '2>&1' to du command used to detect if image resides on another managment
node.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning.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=1468059&r1=1468058&r2=1468059&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm Mon Apr 15 13:41:32
2013
@@ -370,6 +370,8 @@ sub retrieve_image {
# Run du to get the size of the image files on the partner if
the image exists in any of the search paths
my $du_command = "du -b " . join(" ",
@{$partner_info{$partner}{search_paths}});
+ # Add 2>&1 or else STDOUT and STDERR may get mixed together
(See VCL-688)
+ $du_command .= " 2>&1";
my ($du_exit_status, $du_output) = VCL::Module::OS::execute(
{
node => $partner,