arif/maui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

INCR: N->{A|C}Res.Swap is overcommitted with N->CRes.Swap instead of N->CRes.Mem.

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@111 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
bchristiansen 2009-03-18 16:08:51 +00:00
parent 09483ca983
commit fadf3ede89
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,4 +1,5 @@
Maui 3.2.6p21
- N->{A|C}Res.Swap is overcommitted with N->CRes.Swap instead of N->CRes.Mem. (Thanks goes to Roy Dragseth)
- Fixed a nodes configured swap from changing in a maui+pbs setup. (Thanks goes to Gareth Williams of CSIRO)
- Fixed CHECKSUM authentication for maui + slurm. Thanks goes to Eyegene Ryabinkin.
- Fixed 64bit issue. Maui assumed ints were always 8 bytes for 64bit systems even though x86_64 ints are still 4 bytes. This lead to aliasing of large indexed node properties to smaller indexed properties. Maui now triggers off of sizeof(int). Thanks goes to Alexis Cousein.

18
src/moab/MPBSI.c
View File

@ -2902,8 +2902,8 @@ int MPBSQueryMOM(
N->CRes.Mem = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->ARes.Mem = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->CRes.Swap = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->ARes.Swap = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->CRes.Swap = (int)(N->CRes.Swap * MSched.NodeMemOverCommitFactor);
N->ARes.Swap = (int)(N->CRes.Swap * MSched.NodeMemOverCommitFactor);
/* memory factor not applied to node load */
}
@ -6263,6 +6263,11 @@ int __MPBSIGetSSSStatus(
} /* END else if (!strcmp(Name,"message")) */
} /* END while (ptr != NULL) */
/* NOTE: PBS totmem = swap + RAM */
if (TotMem > 0)
N->CRes.Swap = TotMem;
if (MSched.NodeMemOverCommitFactor > 0.0)
{
/* NOTE: both real memory and swap overcommitted */
@ -6270,17 +6275,12 @@ int __MPBSIGetSSSStatus(
N->CRes.Mem = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->ARes.Mem = (int)(N->ARes.Mem * MSched.NodeMemOverCommitFactor);
N->CRes.Swap = (int)(N->CRes.Mem * MSched.NodeMemOverCommitFactor);
N->ARes.Swap = (int)(N->ARes.Mem * MSched.NodeMemOverCommitFactor);
N->CRes.Swap = (int)(N->CRes.Swap * MSched.NodeMemOverCommitFactor);
N->ARes.Swap = (int)(N->ARes.Swap * MSched.NodeMemOverCommitFactor);
/* memory factor not applied to node load */
}
/* NOTE: PBS totmem = swap + RAM */
if (TotMem > 0)
N->CRes.Swap = TotMem;
return(SUCCESS);
} /* END __MPBSIGetSSSStatus() */