Minor changes inr esponse to review feedback and documenting a set of…

… tests that are known to fail at this time.
jcustenborder · Jun 20, 2013 · 0515ae4 · 0515ae4
1 parent 8d5d076
commit 0515ae4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/java/voldemort/tools/PartitionBalance.java b/src/java/voldemort/tools/PartitionBalance.java
@@ -43,12 +43,14 @@ public class PartitionBalance {
      * Multiplier in utility method to weight the balance of "IOPS" (get QPS &
      * pseudo-master put QPS) relative to "CAPACITY".
      */
-    private final static int UTILITY_MULTIPLIER_IOPS = 2;
+    private final static int UTILITY_MULTIPLIER_IOPS = 1;
     /**
      * Multiplier in utility method to weight the balance of "CAPACITY" (put QPS
      * and therefore amount of data stored) relative to "IOPS".
+     * 
+     * Currently, we bias towards balancing capacity over iops.
      */
-    private final static int UTILITY_MULTIPLIER_CAPACITY = 1;
+    private final static int UTILITY_MULTIPLIER_CAPACITY = 2;
 
     private final Cluster cluster;
 

diff --git a/test/unit/voldemort/client/rebalance/RebalanceClusterPlanTest.java b/test/unit/voldemort/client/rebalance/RebalanceClusterPlanTest.java
@@ -39,6 +39,9 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
+// TODO: Most of these tests are currently failing. Once RebalanceClusterPlan is
+// cleaned up further, fix these. In particular, once OrderedClusterTransision
+// is cleaned up, or removed, make sure these tests (or equivalent) all pass.
 public class RebalanceClusterPlanTest extends TestCase {
 
     private static String storeDefFile = "test/common/voldemort/config/stores.xml";
@@ -74,7 +77,6 @@ public void testRebalancePlanInsufficientReplicas() {
     }
 
     public void testRebalancePlanDelete() {
-
         // CASE 1
         currentCluster = ServerTestUtils.getLocalCluster(3, new int[][] { { 0, 1, 2, 3 },
                 { 4, 5, 6, 7 }, {} });