diff --git a/include/msched-version.h b/include/msched-version.h index 82352a1..9825ec7 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "maui-3.2.6p14-snap.1127489156" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1127934075" diff --git a/src/moab/MAM.c b/src/moab/MAM.c index 296dd5b..142026e 100644 --- a/src/moab/MAM.c +++ b/src/moab/MAM.c @@ -686,7 +686,7 @@ int MAMAllocRDebit( const char *FName = "MAMAllocRDebit"; - MDB(3,fAM) MLog("%s(%s,SC,ErrMsg)\n", + MDB(3,fAM) MLog("%s(%s,RIndex,SC,ErrMsg)\n", FName, (R != NULL) ? R->Name : "NULL"); @@ -855,24 +855,17 @@ int MAMAllocRDebit( A = NULL; } - MXMLToString(E,AMISBuffer,sizeof(AMISBuffer),NULL,TRUE); - - rc = MAMQBDoCommand( - AM, - 0, - AMISBuffer, - (void **)&E, - &tmpSC, - AMIRBuffer); - - if (E != NULL) - MXMLDestroyE(&E); - - if (rc == FAILURE) + if (MAMGoldDoCommand(E,&AM->P,RIndex,ErrMsg) == FAILURE) { - if (RIndex != NULL) - *RIndex = mhrAMFailure; - + MDB(2,fAM) MLog("ALERT: cannot debit allocation for reservation\n"); + + if ((AM->JFAction == mamjfaNONE) && + (RIndex != NULL) && + (*RIndex != mhrNoFunds)) + { + return(SUCCESS); + } + return(FAILURE); } } /* END BLOCK */ @@ -2793,6 +2786,9 @@ int MAMQBDoCommand( (A != NULL) ? A->Name : "NULL", CmdIndex, Transaction); + + if (E != NULL) + *E = NULL; if ((A == NULL) || ((A->Type != mamtQBANK) && (A->Type != mamtGOLD))) diff --git a/src/moab/MConst.c b/src/moab/MConst.c index 8a60ee3..ea26ab5 100644 --- a/src/moab/MConst.c +++ b/src/moab/MConst.c @@ -1006,7 +1006,7 @@ const char *MBFMPolicy[] = { "SECONDS", NULL }; -const char *MJSPolicy[] = { "MINPROC", "MAXPROC", "NDMAXPROC", NULL }; +const char *MJSPolicy[] = { "MINPROC", "MAXPROC", "NDMAXPROC", NULL }; const char *MResPolicy[] = { "DEFAULT", "HIGHEST", "CURRENTHIGHEST", "NEVER" }; const char *MHoldType[] = { NONE, "User", "System", "Batch", "Defer", "All", NULL }; const char *MComType[] = { "ROUNDROBIN", "BROADCAST", "TREE", "MASTERSLAVE", NULL };