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

-Change memory selection semantics to cope with heterogenous node memory amount

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4430 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-10-20 23:56:40 +00:00
parent b23b0fe66e
commit 14e6023420
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@ -102,6 +102,7 @@ sub get_path_for_nfsuri {
sub nodesockopen {
my $node = shift;
my $port = shift;
unless ($node) { return 0; }
my $socket;
my $addr = gethostbyname($node);
my $sin = sockaddr_in($port,$addr);
@ -404,8 +405,8 @@ sub pick_target {
my $node = shift;
my $addmemory = shift;
my $target;
my $leastusedmemory=undef;
my $currentusedmemory;
my $mostfreememory=undef;
my $currentfreememory;
my $candidates= $vmhash->{$node}->[0]->{migrationdest};
my $currhyp=$vmhash->{$node}->[0]->{host};
unless ($candidates) {
@ -414,7 +415,6 @@ sub pick_target {
foreach (noderange($candidates)) {
my $targconn;
my $cand=$_;
$currentusedmemory=0;
if ($_ eq $currhyp) { next; } #skip current node
if ($offlinehyps{$_}) { next }; #skip already offlined nodes
if (grep { "$_" eq $cand } @destblacklist) { next; } #skip blacklisted destinations
@ -428,19 +428,20 @@ sub pick_target {
};
}
unless ($targconn) { next; } #skip unreachable destinations
$currentfreememory=$targconn->get_node_info()->{memory};
foreach ($targconn->list_domains()) {
if ($_->get_name() eq 'Domain-0') { next; } #Dom0 memory usage is elastic, we are interested in HVM DomU memory, which is inelastic
$currentusedmemory += $_->get_info()->{memory};
$currentfreememory -= $_->get_info()->{memory};
}
if ($addmemory and $addmemory->{$_}) {
$currentusedmemory += $addmemory->{$_};
$currentfreememory -= $addmemory->{$_};
}
if (not defined ($leastusedmemory)) {
$leastusedmemory=$currentusedmemory;
if (not defined ($mostfreememory)) {
$mostfreememory=$currentfreememory;
$target=$_;
} elsif ($currentusedmemory < $leastusedmemory) {
$leastusedmemory=$currentusedmemory;
} elsif ($currentfreememory > $mostfreememory) {
$mostfreememory=$currentfreememory;
$target=$_;
}
}
@ -1294,7 +1295,7 @@ sub dohyp {
my $node;
my $args = \@exargs;
$vmtab = xCAT::Table->new("vm");
unless ($offlinehyps{$hyp} or nodesockopen($hyp,22)) {
unless ($offlinehyps{$hyp} or ($hyp eq '!@!XCATDUMMYHYPERVISOR!@!') or nodesockopen($hyp,22)) {
$offlinehyps{$hyp}=1;
}