Commit 3a8078bd authored by David Anderson's avatar David Anderson

- client: fix bugs in "abort_jobs_on_exit" feature:

    - clear project backoffs when start abort sequence
    - don't back off projects if in abort sequence

svn path=/trunk/boinc/; revision=17375
parent 3294f5bb
......@@ -1999,3 +1999,13 @@ Rom 25 Feb 2009
clientscr/
screensaver.cpp
David 25 Feb 2009
- client: fix bugs in "abort_jobs_on_exit" feature:
- clear project backoffs when start abort sequence
- don't back off projects if in abort sequence
client/
client_state.cpp
main.cpp
scheduler_op.cpp
......@@ -1664,6 +1664,8 @@ void CLIENT_STATE::check_clock_reset() {
void CLIENT_STATE::start_abort_sequence() {
unsigned int i;
in_abort_sequence = true;
for (i=0; i<results.size(); i++) {
RESULT* rp = results[i];
rp->project->sched_rpc_pending = RPC_REASON_USER_REQ;
......@@ -1675,6 +1677,10 @@ void CLIENT_STATE::start_abort_sequence() {
rp->abort_inactive(ERR_ABORTED_ON_EXIT);
}
}
for (i=0; i<projects.size(); i++) {
PROJECT* p = projects[i];
p->min_rpc_time = 0;
}
}
// The second part of the above; check if RPCs are done
......
......@@ -512,7 +512,6 @@ int boinc_main_loop() {
msg_printf(NULL, MSG_INFO,
"Exit requested; starting abort sequence"
);
gstate.in_abort_sequence = true;
gstate.start_abort_sequence();
}
} else {
......
......@@ -144,6 +144,10 @@ int SCHEDULER_OP::init_op_project(PROJECT* p, int r) {
void SCHEDULER_OP::backoff(PROJECT* p, const char *reason_msg) {
char buf[1024];
if (gstate.in_abort_sequence) {
return;
}
if (p->master_fetch_failures >= gstate.master_fetch_retry_cap) {
sprintf(buf,
"%d consecutive failures fetching scheduler list",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment