diff --git a/CHANGELOG b/CHANGELOG index 2b3734a..2f0ad99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,14 @@ +Maui 3.2.6p15 + + - Various enhancements and bug fixes + - Maui's 'configure' script now compatible with latest TORQUE versions + Maui 3.2.6p14 Features - - Fix buffer overflow in mdiag -p + - Corrected logging in earliest start time evaluation handling + - Fixed buffer overflow in mdiag -p - Fixed bug with floating generic resource tracking - Added support for NODEMEMOVERCOMMITFACTOR on TORQUE - Integrated latest DOE S3 communications library diff --git a/include/msched-version.h b/include/msched-version.h index 4e7b43b..3c79221 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1138394201" diff --git a/src/moab/MJob.c b/src/moab/MJob.c index 15197b6..4caeee7 100644 --- a/src/moab/MJob.c +++ b/src/moab/MJob.c @@ -7282,7 +7282,7 @@ int MJobGetEStartTime( BestTaskCount, EP->Name, J->Name, - MULToTString(*EStartTime - MSched.Time)); + MULToTString(BestStartTime - MSched.Time)); /* apply locality constraints */ @@ -7518,7 +7518,7 @@ int MJobGetEStartTime( DBG(2,fSCHED) DPrint("INFO: located resources for %d tasks for spanning job %s at time %s in range %d\n", J->Request.TC, J->Name, - MULToTString(*EStartTime - MSched.Time), + MULToTString(BestRange[rindex].StartTime - MSched.Time), rindex); if (MJobAllocMNL( @@ -7550,6 +7550,11 @@ int MJobGetEStartTime( return(FAILURE); } + + if ((BestStartTime >= MAX_MTIME) && (BestRange[0].StartTime < BestStartTime)) + { + BestStartTime = BestRange[0].StartTime; + } tmpTaskCount = 0;