diff --git a/checkin_notes b/checkin_notes index 577b98a3e6..5b512190c9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8710,3 +8710,13 @@ David 9 Dec 2010 log_flags.cpp sched/ sched_customize.cpp + +David 9 Dec 2010 + - transitioner: fix bug where retry jobs weren't getting sent + because invalid jobs were counted as successful. + How could this bug possibly have survived this long? + From TJM (thanks -- who are you?) + Fixes #1029 + + sched/ + transitioner.cpp diff --git a/sched/transitioner.cpp b/sched/transitioner.cpp index 94dbc518c7..9da9b0da3f 100644 --- a/sched/transitioner.cpp +++ b/sched/transitioner.cpp @@ -187,6 +187,7 @@ int handle_wu( nover = 0; nerrors = 0; nsuccess = 0; + // not counting invalid results!!!! ncouldnt_send = 0; nno_reply = 0; ndidnt_need = 0; @@ -306,7 +307,11 @@ int handle_wu( have_new_result_to_validate = true; } } - nsuccess++; + // don't count invalid results as successful + // + if (res_item.res_validate_state != VALIDATE_STATE_INVALID) { + nsuccess++; + } break; case RESULT_OUTCOME_CLIENT_ERROR: case RESULT_OUTCOME_VALIDATE_ERROR: