CVS update of BRANCH_sequoia-2_10 <src>/org/continuent/sequoia/controller/loadbalancer/raidb1 (1 file)

    Date: Wednesday, November 22, 2006 @ 15:40:07
  Author: stephane
    Path: .../sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1
     Tag: BRANCH_sequoia-2_10

Modified: RAIDb1_WRR.java (1.12 -> 1.12.2.1)

Backport SEQUOIA-850 into maintenance branch


-----------------+
 RAIDb1_WRR.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Index: 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1/RAIDb1_WRR.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1/RAIDb1_WRR.java:1.12
 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1/RAIDb1_WRR.java:1.12.2.1
--- 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1/RAIDb1_WRR.java:1.12
      Wed Jul 19 11:13:55 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/raidb1/RAIDb1_WRR.java
   Wed Nov 22 15:40:07 2006
@@ -92,7 +92,7 @@
       WaitForCompletionPolicy waitForCompletionPolicy) throws Exception
   {
     super(vdb, waitForCompletionPolicy);
-    currentWeight = -1;
+    currentWeight = 0;
   }
 
   /*
@@ -188,6 +188,7 @@
 
       // Choose the backend (WRR algorithm starts here)
       int w = 0; // cumulative weight
+      boolean backendFound = false;
       for (int i = 0; i < size; i++)
       {
         DatabaseBackend b = (DatabaseBackend) backends.get(i);
@@ -210,10 +211,10 @@
           }
 
           // Ok we reached the needed weight, take this backend
-          if (currentWeight <= w)
+          if (currentWeight < w)
           {
             backend = b;
-            currentWeight++; // Next time take the next
+            backendFound = true;
             break;
           }
         }
@@ -226,7 +227,9 @@
       // We are over the total weight and we are using the
       // first available node. Let's reset the index to 1
       // since we used this first node (0++).
-      if (currentWeight > w)
+      if (backendFound)
+        currentWeight++; // Next time take the next
+      else
         currentWeight = 1;
     }
     catch (RuntimeException e)