vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acob...@apache.org
Subject svn commit: r1506588 - in /vcl: branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm trunk/managementnode/lib/VCL/utils.pm
Date Wed, 24 Jul 2013 15:05:20 GMT
Author: acoburn
Date: Wed Jul 24 15:05:20 2013
New Revision: 1506588

URL: http://svn.apache.org/r1506588
Log:
when the isconnected method is called for windows reservations
the ssh cmd uses 'shortname' when it should be using 'nodename'
(shortname may be undefined). If shortname is defined, then
nodename is set to that value anyway.

Fixed in 2.4 and 2.3.3


Modified:
    vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm
    vcl/trunk/managementnode/lib/VCL/utils.pm

Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm
URL: http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm?rev=1506588&r1=1506587&r2=1506588&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm Wed Jul 24 15:05:20 2013
@@ -1367,7 +1367,7 @@ sub isconnected {
 		if ($image_os_type =~ /windows/i) {
 			#notify($ERRORS{'OK'},0,"checking $nodename $ipaddress");
 			undef @SSHCMD;
-			@SSHCMD = run_ssh_command($shortname, $identity_keys, "netstat -an", "root", 22, 1);
+			@SSHCMD = run_ssh_command($nodename, $identity_keys, "netstat -an", "root", 22, 1);
 			foreach my $line (@{$SSHCMD[1]}) {
 				chomp($line);
 				if ($line =~ /Connection refused/) {

Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1506588&r1=1506587&r2=1506588&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Wed Jul 24 15:05:20 2013
@@ -1379,7 +1379,7 @@ sub isconnected {
 		if ($image_os_type =~ /windows/i) {
 			#notify($ERRORS{'OK'},0,"checking $nodename $ipaddress");
 			undef @SSHCMD;
-			@SSHCMD = run_ssh_command($shortname, $identity_keys, "netstat -an", "root", 22, 0);
+			@SSHCMD = run_ssh_command($nodename, $identity_keys, "netstat -an", "root", 22, 0);
 			foreach my $line (@{$SSHCMD[1]}) {
 				chomp($line);
 				if ($line =~ /Connection refused/) {



Mime
View raw message