diff --git a/src/java/voldemort/tools/PartitionBalance.java b/src/java/voldemort/tools/PartitionBalance.java index 1f95f924d1..f68194e0e1 100644 --- 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 index 7163bbd90f..991757fca7 100644 --- 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 }, {} });