diff --git a/client/sim.cpp b/client/sim.cpp index 9d6762c874..0dab9d340e 100644 --- a/client/sim.cpp +++ b/client/sim.cpp @@ -458,7 +458,8 @@ bool CLIENT_STATE::simulate_rpc(PROJECT* p) { work_fetch.handle_reply(p, &sr, new_results); p->nrpc_failures = 0; p->sched_rpc_pending = 0; - p->min_rpc_time = now + 900; + //p->min_rpc_time = now + 900; + p->min_rpc_time = now; if (sent_something) { request_schedule_cpus("simulate_rpc"); request_work_fetch("simulate_rpc"); diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index 07c6f3e14f..7f73875a86 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -502,7 +502,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) { case DONT_FETCH_BACKED_OFF: break; default: - WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: can't fetch %s", rsc_name_long(i));) + WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: can't fetch %s: %s", rsc_name_long(i), rsc_project_reason_string(rpwf.rsc_project_reason));) continue; } bool buffer_low = (rwf.saturated_time < gstate.work_buf_total()); @@ -730,8 +730,14 @@ PROJECT* WORK_FETCH::choose_project() { } RSC_PROJECT_WORK_FETCH& rpwf = rwf.project_state(p); int reason = rpwf.rsc_project_reason; - if (reason) { - WF_DEBUG(msg_printf(p, MSG_INFO, "%s can't fetch", rsc_name_long(i));) + switch (reason) { + case 0: + case DONT_FETCH_BACKED_OFF: + // request even if backed off - no reason not to. + // + break; + default: + WF_DEBUG(msg_printf(p, MSG_INFO, "%s can't fetch: %s", rsc_name_long(i), rsc_project_reason_string(reason));) continue; } } @@ -1092,7 +1098,6 @@ const char* rsc_project_reason_string(int reason) { case DONT_FETCH_CONFIG: return "client configuration"; case DONT_FETCH_NO_APPS: return "no applications"; case DONT_FETCH_AMS: return "account manager prefs"; - case DONT_FETCH_BACKOFF: return "backoff"; case DONT_FETCH_ZERO_SHARE: return "zero resource share"; case DONT_FETCH_BUFFER_FULL: return "job cache full"; case DONT_FETCH_NOT_HIGHEST_PRIO: return "not highest priority project"; diff --git a/client/work_fetch.h b/client/work_fetch.h index 6c8a3fadcb..182820de2c 100644 --- a/client/work_fetch.h +++ b/client/work_fetch.h @@ -48,7 +48,6 @@ #define DONT_FETCH_CONFIG 3 #define DONT_FETCH_NO_APPS 4 #define DONT_FETCH_AMS 5 -#define DONT_FETCH_BACKOFF 6 #define DONT_FETCH_ZERO_SHARE 7 #define DONT_FETCH_BUFFER_FULL 8 #define DONT_FETCH_NOT_HIGHEST_PRIO 9