From 314863730288d047c69d564810706687f28f9c0b Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Tue, 28 Mar 2023 09:45:40 +0200
Subject: Simplify and add todo about removing disk_distribution in Vespa 9

---
 .../vespa/clustercontroller/core/restapiv2/StateRestApiTest.java | 9 +--------
 configdefinitions/src/vespa/stor-distribution.def                | 1 +
 .../main/java/com/yahoo/vdslib/distribution/Distribution.java    | 5 -----
 3 files changed, 2 insertions(+), 13 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();
     }
 
diff --git a/configdefinitions/src/vespa/stor-distribution.def b/configdefinitions/src/vespa/stor-distribution.def
index 7c8afdf7682..64c1316d46b 100644
--- a/configdefinitions/src/vespa/stor-distribution.def
+++ b/configdefinitions/src/vespa/stor-distribution.def
@@ -67,4 +67,5 @@ group[].nodes[].retired bool default=false
 ## MODULO_INDEX with node index in seed
 ## MODULO_KNUTH with random(node index) in seed
 ## MODULO_BID using all used bits, except count bits, and random(node index)
+## TODO: Deprecated and unused, remove in Vespa 9
 disk_distribution enum { MODULO, MODULO_INDEX, MODULO_KNUTH, MODULO_BID } default=MODULO_BID
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
index 0e8e755c236..4f9186a0569 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
@@ -508,10 +508,6 @@ public class Distribution {
     }
 
     public static String getDefaultDistributionConfig(int redundancy, int nodeCount) {
-        return getDefaultDistributionConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.MODULO_BID);
-    }
-
-    public static String getDefaultDistributionConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) {
         StringBuilder sb = new StringBuilder();
         sb.append("raw:redundancy ").append(redundancy).append("\n")
           .append("group[1]\n")
@@ -522,7 +518,6 @@ public class Distribution {
         for (int i=0; i<nodeCount; ++i) {
             sb.append("group[0].nodes[").append(i).append("].index ").append(i).append("\n");
         }
-        sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n");
         return sb.toString();
     }
 
-- 
cgit v1.2.3