diff --git a/checkin_notes b/checkin_notes index cae8b7e6e3..2eabccf1df 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2799,3 +2799,12 @@ David 19 Mar 2011 lib/ procinfo.cpp + +David 19 Mar 2011 + - scheduler: fix a bug in assigning deadlines to resent jobs. + From Kevin. + NOTE: Kevin also reported a bug that resulted in + way too large (e.g. year) deadlines. + + sched/ + sched_send.cpp diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 64fd8f66c0..a41f057fa8 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -591,6 +591,7 @@ static void get_delay_bound_range( // if original deadline has passed, return zeros // This will skip deadline check. opt = pess = 0; + return; } opt = res_report_deadline - now; pess = wu.delay_bound; @@ -604,6 +605,7 @@ static void get_delay_bound_range( ) { opt = wu.delay_bound*config.reliable_reduced_delay_bound; double est_wallclock_duration = estimate_duration(wu, bav); + // Check to see how reasonable this reduced time is. // Increase it to twice the estimated delay bound // if all the following apply: