arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix parsing of c_disc_target output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12796 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2012-05-18 14:54:44 +00:00
parent 67ba72c0cb
commit e694321b2d
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xCAT-server/lib/xcat/plugins/snmove.pm
View File

@ -1030,15 +1030,14 @@ sub process_request
},
$sub_req, 0, 1
);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}}, "Could not run the nodeset command.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
}
}
my $rsp;
$rsp->{data}=$ret;
xCAT::MsgUtils->message("I", $rsp, $callback);
if ($::RUNCMD_RC != 0)
{
$error++;
}
}
}
} # end - for Linux system only
@ -1813,8 +1812,6 @@ sub dump_retarget
# need node gateway
my $gateway = $nethash{$nd}{'gateway'};
# This should configure the iscsi disc on the client
my $tcmd = qq~/usr/lpp/bos.sysmgt/nim/methods/c_disc_target -a operation=discover -a target="$dump_target" -a dump_port="$dump_port" -a ipaddr="$SNip" -a lun_id="$dump_lunid"~;
my $hd = xCAT::InstUtils->xcmd($callback, $sub_req, "xdsh", $nd, $tcmd, 0);
@ -1829,15 +1826,28 @@ n";
}
chomp $hd;
my $hdisk = $hd;
if ($hd =~ /:/) {
my $node;
($node, $hdisk) = split(': ', $hd);
my $hdisk;
foreach my $line ( split(/\n/, $hd )) {
if ( $line =~ /hdisk/ ) {
$hdisk = $line;
if ($line =~ /:/) {
my $node;
($node, $hdisk) = split(': ', $line);
}
}
}
chomp $hdisk;
$hdisk =~ s/\s*//g;
if (!$hdisk) {
my $rsp;
push @{$rsp->{data}}, "Could not determine dump device for node $nd.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
next;
}
# define the disk on the client
my $mkcmd = qq~/usr/sbin/mkdev -l $hdisk~;