From b155c668fc1de702e591a3528f5ff96d609c49e4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 14 Mar 2012 07:08:05 +0000 Subject: [PATCH] - transitioner: don't clear a WU's HR and HAV class if there are timed-out instances; they could still be returned. svn path=/trunk/boinc/; revision=25420 --- checkin_notes | 7 +++++++ sched/transitioner.cpp | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 1018e9ba4d..44922b4190 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2607,3 +2607,10 @@ David 13 Mar 2012 sched/ sched_send.cpp,h + +David 13 Mar 2012 + - transitioner: don't clear a WU's HR and HAV class if there are + timed-out instances; they could still be returned. + + sched/ + transitioner.cpp diff --git a/sched/transitioner.cpp b/sched/transitioner.cpp index 9c97516ffa..a32d93e694 100644 --- a/sched/transitioner.cpp +++ b/sched/transitioner.cpp @@ -330,11 +330,14 @@ int handle_wu( wu_item.error_mask |= WU_ERROR_COULDNT_SEND_RESULT; } - // if WU has results with errors and no success yet, + // if WU has results with errors and there are no results that are + // - successful + // - in progress + // - timed out (but could still be returned) // reset homogeneous redundancy class to give other platforms a try; // also reset app version ID if using HAV // - if (nerrors && !(nsuccess || ninprogress)) { + if (nerrors && !(nsuccess || ninprogress || nno_reply)) { wu_item.hr_class = 0; wu_item.app_version_id = 0; }