diff --git a/checkin_notes b/checkin_notes index 2b5fff7f09..903a56fdb7 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2958,3 +2958,13 @@ Rom 17 Mar 2006 Rom 17 Mar 2006 (HEAD) - Tag for 5.3.27 release, all platforms boinc_core_release_5_3_27 + +Bruce 17 Mar 2006 + - Adding some logging for scheduler fixes from yesterday: log specific + message saying when a result is unavilable because aonther scheduler + instance grabbed it from under our hands. + + sched/ + sched_send.C + sched_resend.C + diff --git a/sched/sched_resend.C b/sched/sched_resend.C index 167ad0b780..37a4aab4e9 100644 --- a/sched/sched_resend.C +++ b/sched/sched_resend.C @@ -167,13 +167,20 @@ bool resend_lost_work( ) { result.report_deadline = time(0); retval = result.mark_as_sent(result.server_state); - if (retval) { + if (retval==ERR_DB_NOT_FOUND) { + log_messages.printf( + SCHED_MSG_LOG::MSG_CRITICAL, + "[RESULT#%d] [HOST#%d]: CAN'T SEND, already sent to another host\n", + result.id, reply.host.id + ); + } else if (retval) { log_messages.printf( SCHED_MSG_LOG::MSG_CRITICAL, "resend_lost_result: can't update result deadline: %d\n", retval ); - continue; } + if (retval) continue; + retval = update_wu_transition_time(wu, result.report_deadline); if (retval) { log_messages.printf( diff --git a/sched/sched_send.C b/sched/sched_send.C index c21eb03e17..7eb4e6d0f8 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -619,13 +619,19 @@ int add_result_to_reply( ); } retval = result.mark_as_sent(old_server_state); - if (retval) { + if (retval==ERR_DB_NOT_FOUND) { + log_messages.printf( + SCHED_MSG_LOG::MSG_CRITICAL, + "[RESULT#%d] [HOST#%d]: CAN'T SEND, already sent to another host\n", + result.id, reply.host.id + ); + } else if (retval) { log_messages.printf( SCHED_MSG_LOG::MSG_CRITICAL, "add_result_to_reply: can't update result: %d\n", retval ); - return retval; } + if (retval) return retval; wu_seconds_filled = estimate_wallclock_duration(wu, request, reply); log_messages.printf(