diff --git a/sched/credit.cpp b/sched/credit.cpp index f41b74eea6..5b02b9a8b7 100644 --- a/sched/credit.cpp +++ b/sched/credit.cpp @@ -524,10 +524,11 @@ int get_pfc( } } - // is result from old scheduler that didn't set r.app_version_id correctly? - // if so, use WU estimate (this is a transient condition) + // is result from old scheduler that didn't set r.app_version_id? + // if so, use WU estimate (this is a transient condition + // while projects upgrade server software) // - if (r.app_version_id == 0 || r.app_version_id == 1) { + if (r.app_version_id == 0) { if (config.debug_credit) { log_messages.printf(MSG_NORMAL, "[credit] [RESULT#%lu] missing app_version_id (%ld): returning WU default %.2f\n", @@ -648,12 +649,15 @@ int get_pfc( r.flops_estimate/1e9 ); } + // get app version + // avp = av_lookup(r.app_version_id, app_versions); // Sanity check // If an app version scale exists, use it. Otherwise assume 1. - double tmp_scale = (avp && (r.app_version_id>1) && avp->pfc_scale) ? (avp->pfc_scale) : 1.0; + // + double tmp_scale = (avp && avp->pfc_scale) ? (avp->pfc_scale) : 1.0; if (raw_pfc*tmp_scale > wu.rsc_fpops_bound) { // This sanity check should be unnecessary becuase we have a maximum