Author: arkurth
Date: Wed Jul 12 22:57:35 2017
New Revision: 1801786
URL: http://svn.apache.org/viewvc?rev=1801786&view=rev
Log:
VCL-887
Swapped order of if/elsif section in utils.pm::run_ssh_command to prevent
unnecessary warnings in vcld.log when checking for SSH to respond.
Modified:
vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1801786&r1=1801785&r2=1801786&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Wed Jul 12 22:57:35 2017
@@ -4292,12 +4292,12 @@ sub run_ssh_command {
# Kill the child processes of this reservation process
kill_child_processes($PID);
- if ($max_attempts == 1 || $attempts < $max_attempts) {
- notify($ERRORS{'WARNING'}, 0, "attempt
$attempts/$max_attempts: SSH command timed out after $duration seconds, timeout
threshold: $timeout_seconds seconds, command: $node_string:\n$ssh_command");
+ if ($command =~ /testing/) {
+ notify($ERRORS{'DEBUG'}, 0, "attempt
$attempts/$max_attempts: SSH command timed out after $duration seconds, timeout
threshold: $timeout_seconds seconds, command: $node_string:\n$ssh_command");
+ return;
}
- elsif ($command =~ /testing/) {
+ elsif ($max_attempts == 1 || $attempts < $max_attempts)
{
notify($ERRORS{'WARNING'}, 0, "attempt
$attempts/$max_attempts: SSH command timed out after $duration seconds, timeout
threshold: $timeout_seconds seconds, command: $node_string:\n$ssh_command");
- return;
}
else {
notify($ERRORS{'CRITICAL'}, 0, "attempt
$attempts/$max_attempts: SSH command timed out after $duration seconds, timeout
threshold: $timeout_seconds seconds, command: $node_string:\n$ssh_command");
