From 6888468d6d1fe7edd80d45bc5b8537db75e10db4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 26 Apr 2012 21:40:20 +0000 Subject: [PATCH] - scheduler: call get_reliability_and_trust() and get_prefs_info() in send_work_setup(), so that they run before lost jobs are resent. Otherwise lost jobs could get sent using an app version that's prohibited by prefs svn path=/trunk/boinc/; revision=25604 --- checkin_notes | 9 +++++++++ sched/sched_send.cpp | 16 +++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/checkin_notes b/checkin_notes index 4218200a83..f5393ad3c5 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3602,3 +3602,12 @@ David 27 Apr 2012 lib/ str_util.cpp + +David 27 Apr 2012 + - scheduler: call get_reliability_and_trust() and get_prefs_info() + in send_work_setup(), so that they run before lost jobs are resent. + Otherwise lost jobs could get sent using an app version + that's prohibited by prefs + + sched/ + sched_send.cpp diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 62632f9aa7..3cdffa0987 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -802,7 +802,7 @@ int wu_is_infeasible_fast( // return true if the client has a sticky file used by this job // -bool host_has_job_file(WORKUNIT& wu) { +bool host_has_job_file(WORKUNIT&) { return false; } @@ -1640,6 +1640,14 @@ void send_work_setup() { g_wreq->cpu_req_instances = g_request->cpu_req_instances; g_wreq->anonymous_platform = is_anonymous(g_request->platforms.list[0]); + // decide on attributes of HOST_APP_VERSIONS + // + get_reliability_and_trust(); + + // parse project preferences (e.g. no GPUs) + // + get_prefs_info(); + if (g_wreq->anonymous_platform) { estimate_flops_anon_platform(); @@ -1856,12 +1864,6 @@ void send_work() { return; } - // decide on attributes of HOST_APP_VERSIONS - // - get_reliability_and_trust(); - - get_prefs_info(); - if (config.enable_assignment) { if (send_assigned_jobs()) { if (config.debug_assignment) {