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

changes to accommadate new reservation_resources support from LL

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7683 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2010-09-27 21:23:41 +00:00
parent 57537180be
commit ead4611db4
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-server/lib/xcat/plugins/rollupdate.pm
View File

@ -764,6 +764,14 @@ sub ll_jobs {
next ugloop;
}
}
if ( ($machinecount == 0) && ($::updateall) ) {
my $rsp;
push @{ $rsp->{data} },
"\"updateall=yes\" and \"update_if_down=no\", but there are no nodes specifed in the updateall noderange that are currently active in LoadLeveler. Update for updategroup $ugname is canceled.";
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
++$rc;
next ugloop;
}
if ( defined($nodelist) ) { $nodelist =~ s/^\,//; }
# Build updategroup data file
@ -813,12 +821,11 @@ sub ll_jobs {
close($UGDFFILE);
chown( $uid, $gid, $ugdf_file );
if ( defined($machinelist) || $::updateall ) {
if ($machinecount > 0) {
my $llhl_file;
if ( !$::updateall ) {
$machinelist =~ s/^\s+//;
# Build LL hostlist file
$machinelist =~ s/^\s+//;
my $hllines = $machinelist;
$hllines =~ s/"//g;
$hllines =~ s/\s+/\n/g;

2
xCAT-server/share/xcat/rollupdate/ll.tmpl
View File

@ -19,6 +19,6 @@
# @ error = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).err
# @ output = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).out
# @ host_file = [[LLHOSTFILE]]
# @ resources = [[MUTEXRESOURCES]]
# @ reservation_resources = [[MUTEXRESOURCES]]
# @ queue

2
xCAT-server/share/xcat/rollupdate/llall.tmpl
View File

@ -21,6 +21,6 @@
# @ output = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).out
# @ node = [[LLCOUNT]]
# @ requirements = (Feature == "[[UPDATEALLFEATURE]]")
# @ resources = [[MUTEXRESOURCES]]
# @ reservation_resources = [[MUTEXRESOURCES]]
# @ queue