diff --git a/include/msched-version.h b/include/msched-version.h index 62dbbad..1d5601b 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "maui-3.2.6p14-snap.1125586736" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1125680408" diff --git a/src/moab/MPBSI.c b/src/moab/MPBSI.c index cbb4ff8..92d9978 100644 --- a/src/moab/MPBSI.c +++ b/src/moab/MPBSI.c @@ -2304,9 +2304,10 @@ int MPBSNodeLoad( N->CRes.Swap = MAX(MIN_SWAP,N->CRes.Mem); } - /* PBS does not provide pool, opsys, machine speed, or network info */ + /* PBS does not provide pool, machine speed, or network info */ - N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd); + if (N->ActiveOS == 0) + N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd); if (N->Network == 0) N->Network = MUMAGetBM(eNetwork,"DEFAULT",mAdd); @@ -3000,9 +3001,10 @@ int MPBSNodeUpdate( N->CRes.Swap = MAX(MIN_SWAP,N->CRes.Mem); } - /* PBS does not provide pool, opsys, machine speed, or network info */ + /* PBS does not provide pool, machine speed, or network info */ - N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd); + if (N->ActiveOS == 0) + N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd); if (N->Network == 0) N->Network = MUMAGetBM(eNetwork,"DEFAULT",mAdd); @@ -5032,6 +5034,11 @@ int MPBSNodeSetAttr( if (AP->value[0] != '?') N->Arch = MUMAGetIndex(eArch,AP->value,mAdd); } + else if (!strcmp(AP->resource,"opsys")) + { + if (AP->value[0] != '?') + N->ActiveOS = MUMAGetIndex(eOpsys,AP->value,mAdd); + } else if (!strcmp(AP->resource,"mem")) { N->CRes.Mem = (MPBSGetResKVal(AP->value) >> 10); @@ -5474,6 +5481,10 @@ int MPBSJobSetAttr( { RQ->Arch = MUMAGetIndex(eArch,AP->value,mAdd); } + else if (!strcmp(AP->resource,"opsys")) + { + RQ->Opsys = MUMAGetIndex(eOpsys,AP->value,mAdd); + } else if (!strcmp(AP->resource,"pmem")) { /* NOTE: called 'workingset'? (indiana) */ @@ -6037,6 +6048,10 @@ int __MPBSIGetSSSStatus( { N->Arch = MUMAGetIndex(eArch,Value,mAdd); } + else if (!strcmp(Name,"opsys")) + { + N->ActiveOS = MUMAGetIndex(eOpsys,Value,mAdd); + } else if (!strcmp(Name,"totmem")) { TotMem = (MPBSGetResKVal(Value) >> 10);