diff --git a/client/client_types.h b/client/client_types.h index 0b712afda9..c0ce2bc7e7 100644 --- a/client/client_types.h +++ b/client/client_types.h @@ -236,7 +236,7 @@ struct RESULT { bool got_server_ack; // we're received the ack for this result from the server double final_cpu_time; - int state; // state of this result, see above + int state; // state of this result, see lib/result_state.h int exit_status; // return value from the application int signal; // the signal caught by the active_task, // defined only if active_task_state is PROCESS_SIGNALED diff --git a/client/scheduler_op.C b/client/scheduler_op.C index 56cdff9532..97ff79e361 100644 --- a/client/scheduler_op.C +++ b/client/scheduler_op.C @@ -160,11 +160,15 @@ int SCHEDULER_OP::set_min_rpc_time(PROJECT* p) { return 0; } -// Back off on the scheduler and output an error msg if needed +// Back off contacting scheduler and output an error msg if needed // void SCHEDULER_OP::backoff(PROJECT* p, char *error_msg ) { msg_printf(p, MSG_ERROR, error_msg); + // Don't back off more if already backed off + // + if (p->min_rpc_time > 0) return; + if (p->master_fetch_failures >= gstate.master_fetch_retry_cap) { p->master_url_fetch_pending = true; } else { diff --git a/todo b/todo index 80285a3ccf..bfb1d52a46 100755 --- a/todo +++ b/todo @@ -1,3 +1,5 @@ +Don't render graphics if minimized +------------------------ DON'T ADD ANYTHING TO HERE. USE THE TASKBASE INSTEAD. encrypt IDs in URLs (e.g. host)