xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-17 16:50:22 +00:00
Code Issues Releases Wiki Activity

use wrong site attribute xcatdebugmodel before, change to xcatdebugmode

Browse Source
This commit is contained in:
ertaozh
2017-03-27 09:10:28 -04:00
parent 6047515122
commit 39b1df045f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/perl/xCAT/IPMI.pm
View File

@@ -416,7 +416,7 @@ sub subcmd {
my %args = @_;
$self->{expectedcmd} = $args{command};
$self->{expectednetfn} = $args{netfn} + 1;
if ($self->{onlogon_args}->{xcatdebugmodel}) {
if ($self->{onlogon_args}->{xcatdebugmode}) {
my $msg = sprintf ("The command running: $self->{onlogon_args}->{command}:$self->{onlogon_args}->{subcommand}(@{$self->{onlogon_args}->{extraargs}}), the raw data: netfn(0x%02x), cmd(0x%02x)", $args{netfn}, $args{command});
xCAT::SvrUtils::sendmsg([0, $msg], $self->{onlogon_args}->{outfunc});
}

6
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -43,7 +43,7 @@ my %allerrornodes = ();
my %newnodestatus = ();
my $global_sessdata;
my %child_pids;
my $xcatdebugmodel = 0;
my $xcatdebugmode = 0;
my $IPMIXCAT = "/opt/xcat/bin/ipmitool-xcat";
my $NON_BLOCK = 1;
@@ -8163,7 +8163,7 @@ sub process_request {
if ($::XCATSITEVALS{ipmitimeout}) { $ipmitimeout = $::XCATSITEVALS{ipmitimeout} }
if ($::XCATSITEVALS{ipmiretries}) { $ipmitrys = $::XCATSITEVALS{ipmitretries} }
if ($::XCATSITEVALS{ipmisdrcache}) { $enable_cache = $::XCATSITEVALS{ipmisdrcache} }
if ($::XCATSITEVALS{xcatdebugmodel}) { $xcatdebugmodel = $::XCATSITEVALS{xcatdebugmodel} }
if ($::XCATSITEVALS{xcatdebugmode}) { $xcatdebugmodel = $::XCATSITEVALS{xcatdebugmode} }
#my @threads;
my @donargs = ();
@@ -8377,7 +8377,7 @@ sub donode {
command => $command,
extraargs => \@exargs,
subcommand => $exargs[0],
xcatdebugmodel => $xcatdebugmodel,
xcatdebugmode => $xcatdebugmode,
outfunc => $callback,
};
if ($sessiondata{$node}->{ipmisession}->{error}) {