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 2010/11/11 21:56:48 UTC
svn commit: r1034115 - in /incubator/vcl/trunk/managementnode/lib/VCL:
DataStructure.pm utils.pm
Author: arkurth
Date: Thu Nov 11 20:56:47 2010
New Revision: 1034115
URL: http://svn.apache.org/viewvc?rev=1034115&view=rev
Log:
VCL-127
Updated DataStructure.pm::get_reservation_info_string to make the output easier to read and added additional checks to make sure a value is defined or set.
Updated utils.pm::notify to include details about a failed reservation in the message subject.
VCL-154
Updated utils.pm::run_scp_command to detect "no space left" and "name not known" error messages and to handle all other error messages by detecting lines beginning with 'scp:' or 'ssh:'.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=1034115&r1=1034114&r2=1034115&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/DataStructure.pm Thu Nov 11 20:56:47 2010
@@ -2337,77 +2337,105 @@ sub get_reservation_info_string {
my $string;
$string .= "management node: " . (defined($_ = $self->get_management_node_hostname(0)) ? $_ : '<undefined>') . "\n";
- $string .= "reservation process PID: $PID\n";
- $string .= "parent vcld process PID: " . (defined($_ = getppid()) ? $_ : '<undefined>') . "\n";
+ $string .= "reservation PID: $PID\n";
+ $string .= "parent vcld PID: " . (defined($_ = getppid()) ? $_ : '<undefined>') . "\n";
- $string .= "\n";
-
- $string .= "request ID: " . (defined($_ = $self->get_request_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "reservation ID: " . (defined($_ = $self->get_reservation_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "request state/laststate: " . (defined($_ = $self->get_request_state_name(0)) ? $_ : '<undefined>') . "/" . (defined($_ = $self->get_request_laststate_name(0)) ? $_ : '<undefined>') . "\n";
- $string .= "request start time: " . (defined($_ = $self->get_request_start_time(0)) ? $_ : '<undefined>') . "\n";
- $string .= "request end time: " . (defined($_ = $self->get_request_end_time(0)) ? $_ : '<undefined>') . "\n";
- $string .= "reservation count: " . (defined($_ = $self->get_request_reservation_count(0)) ? $_ : '<undefined>') . "\n";
- $string .= "parent reservation: " . (defined($_ = $self->get_request_is_cluster_parent(0)) ? $_ : '<undefined>') . "\n";
- $string .= "for imaging: " . (defined($_ = $self->get_request_forimaging(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
- $string .= "log ID: " . (defined($_ = $self->get_request_log_id(0)) ? $_ : '<undefined>') . "\n";
-
- $string .= "\n";
-
- $string .= "user ID: " . (defined($_ = $self->get_user_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "user name: " . (defined($_ = $self->get_user_firstname(0)) ? $_ : '<undefined>') . " " . (defined($_ = $self->get_user_lastname(0)) ? $_ : '<undefined>') . "\n";
- $string .= "user login ID: " . (defined($_ = $self->get_user_login_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "user affiliation: " . (defined($_ = $self->get_user_affiliation_name(0)) ? $_ : '<undefined>') . "\n";
-
- $string .= "\n";
-
- $string .= "computer id: " . (defined($_ = $self->get_computer_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer name: " . (defined($_ = $self->get_computer_hostname(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer type: " . (defined($_ = $self->get_computer_type(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer eth0 MAC address: " . (defined($_ = $self->get_computer_eth0_mac_address(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer eth1 MAC address: " . (defined($_ = $self->get_computer_eth1_mac_address(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer private IP address: " . (defined($_ = $self->get_computer_private_ip_address(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer public IP address: " . (defined($_ = $self->get_computer_ip_address(0)) ? $_ : '<undefined>') . "\n";
- $string .= "computer in block allocation: " . (defined($_ = is_inblockrequest($self->get_computer_id(0))) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
-
- $string .= "\n";
-
- $string .= "provisioning module name: " . (defined($_ = $self->get_computer_provisioning_module_pretty_name(0)) ? $_ : '<undefined>') . " (" . (defined($_ = $self->get_computer_provisioning_module_name(0)) ? $_ : '<undefined>') . ")\n";
- $string .= "provisioning module Perl package: " . (defined($_ = $self->get_computer_provisioning_module_perl_package(0)) ? $_ : '<undefined>') . "\n";
-
- if ((defined($_ = $self->get_computer_type(0)) ? $_ : '<undefined>') eq 'virtualmachine') {
+ my $request_id = $self->get_request_id(0);
+ if ($request_id) {
$string .= "\n";
- $string .= "vm host ID: " . (defined($_ = $self->get_vmhost_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm host computer ID: " . (defined($_ = $self->get_vmhost_computer_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm host name: " . (defined($_ = $self->get_vmhost_hostname(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm profile: " . (defined($_ = $self->get_vmhost_profile_name(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm profile VM path: " . (defined($_ = $self->get_vmhost_profile_vmpath(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm profile repository path: " . (defined($_ = $self->get_vmhost_profile_repository_path(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm profile datastore path: " . (defined($_ = $self->get_vmhost_profile_datastore_path(0)) ? $_ : '<undefined>') . "\n";
- $string .= "vm profile disk type: " . (defined($_ = $self->get_vmhost_profile_vmdisk(0)) ? $_ : '<undefined>') . "\n";
+
+ $string .= "request ID: $request_id\n";
+ $string .= "reservation ID: " . (defined($_ = $self->get_reservation_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "request state/laststate: " . (defined($_ = $self->get_request_state_name(0)) ? $_ : '<undefined>') . "/" . (defined($_ = $self->get_request_laststate_name(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "request start time: " . (defined($_ = $self->get_request_start_time(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "request end time: " . (defined($_ = $self->get_request_end_time(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "for imaging: " . (defined($_ = $self->get_request_forimaging(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ $string .= "log ID: " . (defined($_ = $self->get_request_log_id(0)) ? ($_ eq '0' ? 'none' : $_) : '<undefined>') . "\n";
+
+ my $reservation_count = $self->get_request_reservation_count(0);
+ if (defined($reservation_count) && $reservation_count > 1) {
+ $string .= "cluster reservation: yes\n";
+ $string .= "reservation count: $reservation_count\n";
+ $string .= "parent reservation: " . (defined($_ = $self->get_request_is_cluster_parent(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ }
}
- $string .= "\n";
-
- $string .= "image ID: " . (defined($_ = $self->get_image_id(0)) ? $_ : '<undefined>') . "\n";
- $string .= "image revision ID: " . (defined($_ = $self->get_imagerevision_id(0)) ? $_ : '<undefined>') . "\n";
-
- $string .= "image name: " . (defined($_ = $self->get_image_name(0)) ? $_ : '<undefined>') . "\n";
- $string .= "image display name: " . (defined($_ = $self->get_image_prettyname(0)) ? $_ : '<undefined>') . "\n";
- $string .= "image size: " . (defined($_ = $self->get_image_size(0)) ? $_ : '<undefined>') . " MB\n";
- $string .= "use Sysprep: " . (defined($_ = $self->get_imagemeta_sysprep(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
- $string .= "root access: " . (defined($_ = $self->get_imagemeta_rootaccess(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
- $string .= "image owner affiliation: " . (defined($_ = $self->get_image_affiliation_name(0)) ? $_ : '<undefined>') . "\n";
- $string .= "image revision date created: " . (defined($_ = $self->get_imagerevision_date_created(0)) ? $_ : '<undefined>') . "\n";
- $string .= "image revision production: " . (defined($_ = $self->get_imagerevision_production(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
- $string .= "image revision comments: " . (defined($_ = $self->get_imagerevision_comments(0)) ? $_ : '<undefined>') . "\n";
+ my $blockrequest_id = $self->get_blockrequest_id(0);
+ if ($blockrequest_id) {
+ $string .= "\n";
+
+ $string .= "blockrequest: " . (defined($_ = $self->get_blockrequest_name(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "block request ID: $blockrequest_id\n";
+ $string .= "blockrequest image ID: " . (defined($_ = $self->get_blockrequest_image_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "number of machines: " . (defined($_ = $self->get_blockrequest_number_machines(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "owner ID: " . (defined($_ = $self->get_blockrequest_owner_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "management node ID: " . (defined($_ = $self->get_blockrequest_management_node_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "processing flag: " . (defined($_ = $self->get_blockrequest_processing(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "mode: " . (defined($_ = $self->get_blockrequest_mode(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "blocktime ID: " . (defined($_ = $self->get_blocktime_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "blocktime start: " . (defined($_ = $self->get_blocktime_start(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "blocktime end: " . (defined($_ = $self->get_blocktime_end(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "blocktime processed flag: " . (defined($_ = $self->get_blocktime_processed(0)) ? $_ : '<undefined>') . "\n";
+ }
- $string .= "\n";
+ my $computer_id = $self->get_computer_id(0);
+ if (defined($computer_id)) {
+ $string .= "\n";
+
+ $string .= "computer: " . (defined($_ = $self->get_computer_hostname(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer id: $computer_id\n";
+ $string .= "computer type: " . (defined($_ = $self->get_computer_type(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer eth0 MAC address: " . (defined($_ = $self->get_computer_eth0_mac_address(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer eth1 MAC address: " . (defined($_ = $self->get_computer_eth1_mac_address(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer private IP address: " . (defined($_ = $self->get_computer_private_ip_address(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer public IP address: " . (defined($_ = $self->get_computer_ip_address(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "computer in block allocation: " . (defined($_ = is_inblockrequest($self->get_computer_id(0))) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ $string .= "provisioning module: " . (defined($_ = $self->get_computer_provisioning_module_perl_package(0)) ? $_ : '<undefined>') . "\n";
+
+ if ($self->get_computer_type(0) eq 'virtualmachine') {
+ $string .= "\n";
+
+ $string .= "vm host: " . (defined($_ = $self->get_vmhost_hostname(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm host ID: " . (defined($_ = $self->get_vmhost_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm host computer ID: " . (defined($_ = $self->get_vmhost_computer_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm profile: " . (defined($_ = $self->get_vmhost_profile_name(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm profile VM path: " . (defined($_ = $self->get_vmhost_profile_vmpath(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm profile repository path: " . (defined($_ = $self->get_vmhost_profile_repository_path(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm profile datastore path: " . (defined($_ = $self->get_vmhost_profile_datastore_path(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "vm profile disk type: " . (defined($_ = $self->get_vmhost_profile_vmdisk(0)) ? $_ : '<undefined>') . "\n";
+ }
+ }
- $string .= "OS module name: " . (defined($_ = $self->get_image_os_module_pretty_name(0)) ? $_ : '<undefined>') . " (" . (defined($_ = $self->get_image_os_module_name(0)) ? $_ : '<undefined>') . ")\n";
- $string .= "OS module Perl package: " . (defined($_ = $self->get_image_os_module_perl_package(0)) ? $_ : '<undefined>') . "\n";
+ my $image_id = $self->get_image_id(0);
+ if (defined($image_id)) {
+ $string .= "\n";
+
+ $string .= "image: " . (defined($_ = $self->get_image_name(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image display name: " . (defined($_ = $self->get_image_prettyname(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image ID: $image_id\n";
+ $string .= "image revision ID: " . (defined($_ = $self->get_imagerevision_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image size: " . (defined($_ = $self->get_image_size(0)) ? $_ : '<undefined>') . " MB\n";
+ $string .= "use Sysprep: " . (defined($_ = $self->get_imagemeta_sysprep(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ $string .= "root access: " . (defined($_ = $self->get_imagemeta_rootaccess(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ $string .= "image owner ID: " . (defined($_ = $self->get_image_ownerid(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image owner affiliation: " . (defined($_ = $self->get_image_affiliation_name(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image revision date created: " . (defined($_ = $self->get_imagerevision_date_created(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "image revision production: " . (defined($_ = $self->get_imagerevision_production(0)) ? ($_ ? 'yes' : 'no') : '<undefined>') . "\n";
+ $string .= "OS module: " . (defined($_ = $self->get_image_os_module_perl_package(0)) ? $_ : '<undefined>') . "\n";
+
+ my $imagerevision_comments = $self->get_imagerevision_comments(0);
+ $string .= "image revision comments: $imagerevision_comments\n" if $imagerevision_comments;
+ }
- $string .= "\n";
+ my $user_id = $self->get_user_id(0);
+ if (defined($user_id)) {
+ $string .= "\n";
+
+ $string .= "user: " . (defined($_ = $self->get_user_login_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "user name: " . (defined($_ = $self->get_user_firstname(0)) ? $_ : '<undefined>') . " " . (defined($_ = $self->get_user_lastname(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "user ID: " . (defined($_ = $self->get_user_id(0)) ? $_ : '<undefined>') . "\n";
+ $string .= "user affiliation: " . (defined($_ = $self->get_user_affiliation_name(0)) ? $_ : '<undefined>') . "\n";
+ }
return $string;
}
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1034115&r1=1034114&r2=1034115&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Thu Nov 11 20:56:47 2010
@@ -607,27 +607,20 @@ sub notify {
# Get info about the subroutine which called this subroutine
my ($package, $filename, $line, $sub) = caller(0);
- # Remove leading path from filename
- $filename =~ s/.*\///;
-
- # Remove the leading package path from the sub name (VC::...)
- $sub =~ s/.*:://;
-
# Assemble the caller information
my $caller_info;
if (caller(1)) {
- my ($caller_previous_package, $caller_previous_filename, $caller_previous_line, $caller_previous_sub) = caller(1);
- $caller_previous_filename =~ s/.*\///;
- $caller_previous_sub =~ s/.*:://;
- $caller_info = "$filename:$caller_previous_sub($line)";
- }
- else {
- $caller_info = "$filename:$sub($line)";
+ $sub = (caller(1))[3];
}
- # Get the caller trace information
- my $caller_trace = get_caller_trace(6);
+ # Remove leading path from filename
+ $filename =~ s/.*\///;
+
+ # Remove the leading package path from the sub name (VC::...)
+ $sub =~ s/.*:://;
+ $caller_info = "$filename:$sub($line)";
+
# Format the message string
# Remove Windows carriage returns from the message string for consistency
$string =~ s/\r//gs;
@@ -665,59 +658,85 @@ sub notify {
# Assemble an email message body if CRITICAL
my $body;
- if ($error == 2) {
- # Get the previous several log file entries for this process
- my $log_history_count = 100;
- my $log_history = "RECENT LOG ENTRIES FOR THIS PROCESS:\n";
- $log_history .= `grep "|$PID|" $log | tail -n $log_history_count` if $log;
- chomp $log_history;
-
- # Assemble the e-mail message body
- $body = <<"END";
-$string
-
-Time: $currenttime
-PID: $PID
-Caller: $caller_info
-
-$caller_trace
-
-$log_history
-END
-
- # Add the formatted data to the message body if data was passed
- $body .= "\n\n$formatted_data\n" if $formatted_data;
- } ## end if ($error == 2)
-
-
- # OK, VERBOSE
- if (!$error || ($error == 6 && $VERBOSE)) {
-
- }
-
+ my $body_separator = '-' x 72;
+
# WARNING
if ($error == 1) {
+ my $caller_trace = get_caller_trace(6);
$log_message = "\n---- WARNING ---- \n$log_message\n$caller_trace\n\n";
}
# CRITICAL
elsif ($error == 2) {
- $log_message = "\n---- CRITICAL ---- \n$log_message\n$caller_trace\n";
- $log_message .= "$formatted_data\n" if $formatted_data;
- $log_message .= "\n";
-
+ my $caller_trace = get_caller_trace(15);
+ $log_message = "\n---- CRITICAL ---- \n$log_message\n$caller_trace\n\n";
+
+ # Assemble the e-mail message body
+ $body = <<"END";
+$string
+$body_separator
+time: $currenttime
+caller: $caller_info
+$caller_trace
+$body_separator
+END
+
+ # Add the reservation info to the message if the DataStructure object is defined in %ENV
+ if ($ENV{data}) {
+ my $reservation_info_string = $ENV{data}->get_reservation_info_string();
+ if ($reservation_info_string) {
+ $reservation_info_string =~ s/\s+$//;
+ $body .= "$reservation_info_string\n";
+ $body .= "$body_separator\n";
+ }
+ }
+
+ # Get the previous several log file entries for this process
+ my $log_history_count = 100;
+ my $log_history = "RECENT LOG ENTRIES FOR THIS PROCESS:\n";
+ $log_history .= `grep "|$PID|" $log | tail -n $log_history_count` if $log;
+ chomp $log_history;
+ $body .= $log_history;
+
+ # Add the formatted data to the message body if data was passed
+ $body .= "\n\nDATA:\n$formatted_data\n" if $formatted_data;
+
+ my $subject = "PROBLEM -- ";
+
+ # Assemble the process identifier string
+ if (defined $ENV{request_id} && defined $ENV{reservation_id} && defined $ENV{state}) {
+ $subject .= "$ENV{request_id}:$ENV{reservation_id}|$ENV{state}|$filename";
+ }
+ else {
+ $subject .= "$caller_info";
+ }
+
+ if (defined($ENV{data})) {
+ my $blockrequest_name = $ENV{data}->get_blockrequest_name(0);
+ $subject .= "|$blockrequest_name" if (defined $blockrequest_name);
+
+ my $computer_name = $ENV{data}->get_computer_short_name(0);
+ $subject .= "|$computer_name" if (defined $computer_name);
+
+ my $image_name = $ENV{data}->get_image_name(0);
+ $subject .= "|$image_name" if (defined $image_name);
+
+ my $user_name = $ENV{data}->get_user_login_id(0);
+ $subject .= "|$user_name" if (defined $user_name);
+ }
+
my $from = "root\@$FQDN";
my $to = $sysadmin;
- my $subject = "PROBLEM -- $filename";
+
mail($to, $subject, $body, $from);
} ## end elsif ($error == 2) [ if ($error == 1)
-
+
# MAILMASTERS - only for email notifications
elsif ($error == 5 && $shared_mail_box) {
my $to = $shared_mail_box;
my $from = "root\@$FQDN";
my $subject = "Informational -- $filename";
-
+
# Assemble the e-mail message body
$body = <<"END";
$string
@@ -727,7 +746,7 @@ PID: $PID
Caller: $caller_info
END
-
+
mail($to, $subject, $body, $from);
}
@@ -5573,23 +5592,18 @@ sub run_scp_command {
# Delay performing next attempt if this isn't the first attempt
if ($attempts > 1) {
- my $delay;
- if ($attempts == 2) {
- $delay = 2;
- }
- else {
- # Progressively increase the delay
- $delay = (5 * $attempts);
- }
+ my $delay = 2;
notify($ERRORS{'DEBUG'}, 0, "sleeping for $delay seconds before making next SCP attempt");
sleep $delay;
+ notify($ERRORS{'DEBUG'}, 0, "attempt $attempts/$max_attempts: executing SCP command: $scp_command");
+ }
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "attempting to copy file via SCP: '$path1' --> '$path2'");
}
## Add -v (verbose) argument to command if this is the 2nd attempt
#$scp_command =~ s/$scp_path/$scp_path -v/ if $attempts == 2;
- notify($ERRORS{'DEBUG'}, 0, "attempt $attempts/$max_attempts: executing SCP command: $scp_command");
-
$scp_output = `$scp_command`;
# Save the exit status
@@ -5610,42 +5624,22 @@ sub run_scp_command {
$scp_output = '';
}
- # Get a slice of the SCP output if there are many lines
- my @scp_output_formatted_lines = split("\n", $scp_output);
- my $scp_output_formatted_line_count = scalar @scp_output_formatted_lines;
- if ($scp_output_formatted_line_count > 50) {
- @scp_output_formatted_lines = @scp_output_formatted_lines[0 .. 49];
- push(@scp_output_formatted_lines, "displayed first 50 of $scp_output_formatted_line_count SCP output lines");
- $scp_output = join("\n", @scp_output_formatted_lines);
- }
-
# Check the output for known error messages
- # Check the exit status
- # scp exits with 0 on success or >0 if an error occurred
- if ($scp_output =~ /permission denied|no such file|ambiguous target|is a directory/i) {
- notify($ERRORS{'WARNING'}, 0, "failed to copy file, scp error occurred: command: $scp_command, exit status: $scp_exit_status, output: $scp_output");
+ if ($scp_output =~ /permission denied|no such file|ambiguous target|is a directory|not known|no space/i) {
+ notify($ERRORS{'WARNING'}, 0, "failed to copy via SCP: '$path1' --> '$path2'\ncommand: $scp_command\noutput:\n$scp_output");
return 0;
}
- elsif ($scp_exit_status > 0 || $scp_output =~ /lost connection|failed|reset by peer|no route to host/i) {
- notify($ERRORS{'WARNING'}, 0, "scp error occurred: attempt $attempts/$max_attempts, command: $scp_command, exit status: $scp_exit_status, output: $scp_output");
-
- # Temporary fix for problem of nodes using different ports
- if ($attempts == 3) {
- $max_attempts++;
- notify($ERRORS{'OK'}, 0, "making 1 more attempt using port 24");
- $scp_command = "$scp_path -B $identity_paths-P 24 -p -r $path1 $path2 2>&1";
- }
-
+ elsif ($scp_output =~ /^(scp|ssh):/i) {
+ notify($ERRORS{'WARNING'}, 0, "attempt $attempts/$max_attempts: error occurred while attempting to copy file via SCP: '$path1' --> '$path2'\ncommand: $scp_command\noutput:\n$scp_output");
next;
}
else {
- notify($ERRORS{'OK'}, 0, "scp successful: attempt $attempts/$max_attempts, exit status: $scp_exit_status, output: $scp_output");
+ notify($ERRORS{'OK'}, 0, "copied file via SCP: '$path1' --> '$path2'");
return 1;
}
} ## end while ($attempts < $max_attempts)
# Failure
- notify($ERRORS{'WARNING'}, 0, "failed to copy files using scp after $attempts attempts, command: $scp_command, exit status: $scp_exit_status, output: $scp_output");
return 0;
} ## end sub run_scp_command
@@ -8612,16 +8606,29 @@ sub get_caller_trace {
# Add one to make the argument usage more intuitive
# One of the levels is the subroutine which called this
$level_limit++;
-
+
+ # Check if this subroutine was called from notify
+ my $called_from_notify = ((caller(1))[3] =~ /notify$/)? 1 : 0;
+
my $caller_trace = "";
for (1 .. $level_limit) {
my $caller_index = $_;
if (caller($caller_index)) {
my ($package_last, $filename_last, $line_last, $sub_last) = caller($caller_index - 1);
my ($package, $filename, $line, $sub) = caller($caller_index);
-
+
$filename_last =~ s/.*\///;
$sub =~ s/.*:://;
+
+ if ($called_from_notify) {
+ if ($sub =~ /notify$/) {
+ next;
+ }
+ else {
+ $caller_index--;
+ }
+ }
+
if ($brief_output) {
$caller_trace .= (($caller_index - 1) * -1) . ":$filename_last:$sub:$line_last;";
}