From ebbf9d5636b10fa2746cb449838f6d8a704807bc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 1 Mar 2009 18:11:18 +0000
Subject: [PATCH] - client: if we're going to do a scheduler RPC for reasons   
  other than work fetch (e.g., user request, project request)     temporarily
 clear resource backoffs while deciding     whether to request work.     The
 backoffs are there only to delay RPCs,     and we're going an RPC anyway.

svn path=/trunk/boinc/; revision=17416
---
 checkin_notes         | 11 +++++++++++
 client/work_fetch.cpp | 10 +++++++++-
 doc/boinc_news.php    |  3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index eaacc94f9b..d029dfa759 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2405,3 +2405,14 @@ David  27 Feb 2009
     client/
         rr_sim.cpp
         work_fetch.cpp
+
+David  1 Mar 2009
+    - client: if we're going to do a scheduler RPC for reasons
+        other than work fetch (e.g., user request, project request)
+        temporarily clear resource backoffs while deciding
+        whether to request work.
+        The backoffs are there only to delay RPCs,
+        and we're going an RPC anyway.
+
+    client/
+        work_fetch.cpp
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index d246c4556d..a17404374d 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -349,9 +349,17 @@ void WORK_FETCH::compute_work_request(PROJECT* p) {
         return;
     }
 
-    // see if this is the project we'd ask for work anyway
+    // See if this is the project we'd ask for work anyway.
+    // Temporarily clear resource backoffs,
+    // since we're going to contact this project in any case.
     //
+    double cpu_save = p->cpu_pwf.backoff_time;
+    double cuda_save = p->cuda_pwf.backoff_time;
+    p->cpu_pwf.backoff_time = 0;
+    p->cuda_pwf.backoff_time = 0;
     PROJECT* pbest = choose_project();
+    p->cpu_pwf.backoff_time = cpu_save;
+    p->cuda_pwf.backoff_time = cuda_save;
     if (p == pbest) return;
 
     // if not, don't request any work
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 09926fbfb5..e1dde2ec8f 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,9 @@
 <?
 
 $project_news = array(
+array("February 27, 2009",
+    "We have rolled back to 6.4.5 for our latest stable version until 6.4.7 can be built. Something happened to 6.4.6 on our mirrors."
+),
 array("February 17, 2009",
     "A new add-on program for Windows,
     <a href=http://boinc.berkeley.edu/addon_item.php?platform=win&item=http%3A%2F%2Fefmer.eu%2Fboinc%2F>TThrottle</a>,