Ticket #1034: sched_credit.patch

sched/credit.cpp

@@ -732 +732 @@
                 );
             }
         }
-        if (max_granted_credit && pfc*COBBLESTONE_SCALE > max_granted_credit) {
+        if (pfc > wu.rsc_fpops_bound) {
             log_messages.printf(MSG_NORMAL,
-                "[credit] Credit too high: %f\n", pfc*COBBLESTONE_SCALE
+                "[credit] PFC too high: %f\n", pfc*COBBLESTONE_SCALE
             );
             pfc = wu_estimated_pfc(wu, app);
         }
-        if (pfc > wu.rsc_fpops_bound) {
+        if (max_granted_credit && pfc*COBBLESTONE_SCALE > max_granted_credit) {
             log_messages.printf(MSG_NORMAL,
-                "[credit] PFC too high: %f\n", pfc*COBBLESTONE_SCALE
+                "[credit] Credit too high: %f\n", pfc*COBBLESTONE_SCALE
             );
-            pfc = wu_estimated_pfc(wu, app);
+            // Don't use the fallback wu_estimated_pfc() here, since it's not necessarily any more correct.
+            pfc = max_granted_credit / COBBLESTONE_SCALE;
         }
         if (mode == PFC_MODE_NORMAL) {
             normal.push_back(pfc);