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

When assigning free zFCP device channels, check if device channel is in use in the pool.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15116 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2013-02-08 17:29:09 +00:00
parent aba74b7d52
commit 29f32d10ae
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
perl-xCAT/xCAT/zvmUtils.pm
View File

@ -2125,6 +2125,7 @@ sub querySSI {
Description : Execute a remote command
Arguments : User (root or non-root)
Node
Command to execute
Returns : Output returned from executing command
Example : my $out = xCAT::zvmUtils->rExecute($user, $node, $cmd);
@ -2146,4 +2147,51 @@ sub rExecute {
$cmd = "'" . $cmd . "'";
$out = `ssh $user\@$node "$sudo sh -c $cmd"`;
return $out;
}
#-------------------------------------------------------
=head3 getUsedFcpDevices
Description : Get a list of used FCP devices in the zFCP pools
Arguments : User (root or non-root)
zHCP
Returns : List of known FCP devices
Example : my %devices = xCAT::zvmUtils->getUsedFcpDevices($user, $zhcp);
=cut
#-------------------------------------------------------
sub getUsedFcpDevices {
my ( $class, $user, $hcp ) = @_;
# Directory where zFCP pools are
my $pool = "/var/opt/zhcp/zfcp";
my $sudo = "sudo";
if ($user eq "root") {
$sudo = "";
}
# Grep the pools for used or allocated zFCP devices
my %usedDevices;
my @args;
my @devices = split("\n", `ssh $user\@$hcp "$sudo cat $pool/*.conf" | egrep -i "used|allocated"`);
foreach (@devices) {
@args = split(",", $_);
# Sample pool configuration file:
# #status,wwpn,lun,size,range,owner,channel,tag
# used,1000000000000000,2000000000000110,8g,3B00-3B3F,ihost1,1a23,$root_device$
# free,1000000000000000,2000000000000111,,3B00-3B3F,,,
# free,1230000000000000,2000000000000112,,3B00-3B3F,,,
$args[6] = xCAT::zvmUtils->trimStr($args[6]);
# Push used or allocated devices into hash
if ($args[6]) {
$usedDevices{uc($args[6])} = 1;
}
}
return %usedDevices;
}

9
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@ -1108,6 +1108,8 @@ sub changeVM {
my $min;
my $max;
if ($device =~ m/auto/i) {
my %usedDevices = xCAT::zvmUtils->getUsedFcpDevices($::SUDOER, $hcp);
if ($device =~ m/,/i) {
@ranges = split(';', $range);
} else {
@ -1141,7 +1143,12 @@ sub changeVM {
($min, $max) = split('-', $_);
if (hex($device) >= hex($min) && hex($device) <= hex($max)) {
$found = 1;
last;
$device = uc($device);
# Used found zFCP channel if not in use or allocated
if (!$usedDevices{$device}) {
last;
}
}
}
}