diff options
author | Harald Musum <musum@yahooinc.com> | 2023-03-28 09:45:40 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-03-28 09:45:40 +0200 |
commit | 314863730288d047c69d564810706687f28f9c0b (patch) | |
tree | ecf16df48ee5cb5c041223b559124e4dffa66e58 /clustercontroller-core | |
parent | 642acda2e5a28ba06c094e503c662b514efadabe (diff) |
Simplify and add todo about removing disk_distribution in Vespa 9
Diffstat (limited to 'clustercontroller-core')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java index 58208cb453b..b09069dbad7 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java @@ -18,8 +18,6 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo; import com.yahoo.vespa.clustercontroller.utils.staterestapi.StateRestAPI; import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRequest; import com.yahoo.vespa.clustercontroller.utils.staterestapi.server.JsonWriter; -import com.yahoo.vespa.config.content.StorDistributionConfig; - import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -169,12 +167,8 @@ public abstract class StateRestApiTest { "}"; } - private static String getSimpleGroupConfig(int redundancy, int nodeCount) { - return getSimpleGroupConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.Enum.MODULO_BID); - } - // TODO: Use config builder instead of creating raw: config - private static String getSimpleGroupConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) { + private static String getSimpleGroupConfig(int redundancy, int nodeCount) { StringBuilder sb = new StringBuilder(); sb.append("raw:redundancy ").append(redundancy).append("\n").append("group[4]\n"); @@ -205,7 +199,6 @@ public abstract class StateRestApiTest { for (int i=1; i<nodeCount; i += 2) { sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n"); } - sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n"); return sb.toString(); } |