diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-11 15:53:02 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-11 15:53:02 +0100 |
commit | 07accb9f7c8860089b3286d3e286f6ea0f3094ab (patch) | |
tree | 40a616882edc98818d823a33bb9360f0b0269be5 /vdslib/src/main | |
parent | 0ea817a6c5490f7251f89c0e743d20270925c469 (diff) |
GC use of NodeState.getDiskCount and NodeState.getDiskStates.
Diffstat (limited to 'vdslib/src/main')
-rw-r--r-- | vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java | 35 | ||||
-rw-r--r-- | vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java | 3 |
2 files changed, 0 insertions, 38 deletions
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 0a2d79b6f2a..81e0e3e86c6 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -4,11 +4,9 @@ package com.yahoo.vdslib.distribution; import com.yahoo.collections.BobHash; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.vdslib.state.ClusterState; -import com.yahoo.vdslib.state.DiskState; import com.yahoo.vdslib.state.Node; import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; -import com.yahoo.vdslib.state.State; import com.yahoo.vespa.config.content.DistributionConfig; import com.yahoo.vespa.config.content.StorDistributionConfig; import com.yahoo.document.BucketId; @@ -352,39 +350,6 @@ public class Distribution { int initval = (1664525 * nodeIndex + 0xdeadbeef); return BobHash.hash(ordered, initval); } - /** - * This function should only depend on disk distribution and node index. It is - * assumed that any other change, for instance in hierarchical grouping, does - * not change disk index on disk. - */ - int getIdealDisk(NodeState nodeState, int nodeIndex, BucketId bucket) { - // Catch special cases in a single if statement - if (nodeState.getDiskCount() < 2) { - if (nodeState.getDiskCount() == 1) { - return 0; - } - throw new IllegalArgumentException( - "Cannot pick ideal disk without knowing disk count."); - } - - RandomGen randomizer = new RandomGen(getDiskSeed(bucket, nodeIndex)); - - double maxScore = 0.0; - int idealDisk = 0xffff; - for (int i=0, n=nodeState.getDiskCount(); i<n; ++i) { - double score = randomizer.nextDouble(); - DiskState diskState = (nodeState.getDiskState(i)); - if (diskState.getCapacity() != 1.0) { - score = Math.pow(score, - 1.0 / diskState.getCapacity()); - } - if (score > maxScore) { - maxScore = score; - idealDisk = i; - } - } - return idealDisk; - } List<Integer> getIdealStorageNodes(ClusterState clusterState, BucketId bucket, String upStates) throws TooFewBucketBitsInUseException { List<Integer> resultNodes = new ArrayList<>(); diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java index bdc30f0b230..e3b65c88f59 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java @@ -200,9 +200,6 @@ public class NodeState implements Cloneable { public int getMinUsedBits() { return minUsedBits; } public long getStartTimestamp() { return startTimestamp; } - public int getDiskCount() { return diskStates.size(); } - public List<DiskState> getDiskStates() { return Collections.unmodifiableList(diskStates); } - public String toString() { return toString(false); } public String toString(boolean compact) { |