scheduler: fix bug that caused no jobs to be sent to pre-6.7 clients

This commit is contained in:
David Anderson 2014-09-03 15:35:36 -07:00
parent b1fdf621be
commit 6c5849d817
1 changed files with 7 additions and 3 deletions

View File

@ -398,9 +398,6 @@ struct WORK_REQ_BASE {
// instance-seconds requested
double req_instances[NPROC_TYPES];
// number of idle instances, use if possible
inline bool need_proc_type(int t) {
return (req_secs[t]>0) || (req_instances[t]>0);
}
inline void clear_req(int proc_type) {
req_secs[proc_type] = 0;
req_instances[proc_type] = 0;
@ -414,6 +411,13 @@ struct WORK_REQ_BASE {
//
bool rsc_spec_request;
inline bool need_proc_type(int t) {
if (rsc_spec_request) {
return (req_secs[t]>0) || (req_instances[t]>0);
}
return seconds_to_fill > 0;
}
double disk_available;
double ram, usable_ram;
double cpu_available_frac;