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

Be more permissive about EXECQUEONLY -garrick

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@46 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
gstaples 2005-11-05 02:42:08 +00:00
parent 8a88b0922b
commit 6cf129f4e2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/moab/MPBSI.c
View File

@ -587,13 +587,8 @@ int MPBSWorkloadQuery(
if (JCount != NULL)
*JCount = 0;
/* torque-2.0.0p1 and up can limit pbs_statjob() to only return executable jobs */
#ifndef EXECQUEONLY
#define EXECQUEONLY NULL
#endif
if ((MSim.RMFailureTime >= MSched.Time) ||
(jobs = pbs_statjob(R->U.PBS.ServerSD,NULL,NULL,EXECQUEONLY)) == NULL)
(jobs = pbs_statjob(R->U.PBS.ServerSD,NULL,NULL,"exec_queue_only")) == NULL)
{
if (MSim.RMFailureTime < MSched.Time)
ErrMsg = pbs_geterrmsg(R->U.PBS.ServerSD);
@ -630,6 +625,10 @@ int MPBSWorkloadQuery(
for (cur_job = jobs;cur_job != NULL;cur_job = cur_job->next)
{
/* torque-2.0.0p1 and up can limit pbs_statjob() to only return executable jobs */
#ifndef EXECQUEONLY
/* ignore jobs that are in route queues */
if (__MPBSJobChkExecutable(cur_job) == FAILURE)
@ -639,6 +638,7 @@ int MPBSWorkloadQuery(
continue;
}
#endif
if (JCount != NULL)
(*JCount)++;