diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-11 15:14:36 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-03-11 15:14:36 +0100 |
commit | 642961f6cb2e8a34c830b50e0ceb06bc373319bf (patch) | |
tree | 557c08c8725c6a9a6f6758dca40ef101f8c1552e /vdslib/src/main | |
parent | 0514c6f97518b2b9eb06225c6601abe91ede5679 (diff) |
GC long gone disk state checks.
Diffstat (limited to 'vdslib/src/main')
-rw-r--r-- | vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java | 7 | ||||
-rw-r--r-- | vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java | 17 |
2 files changed, 0 insertions, 24 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 f926b763711..0a2d79b6f2a 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -426,13 +426,6 @@ public class Distribution { continue; } - if (nodeState.isAnyDiskDown()) { - int idealDiskIndex = getIdealDisk(nodeState, configuredNode.index(), bucket); - if (nodeState.getDiskState(idealDiskIndex).getState() != State.UP) { - continue; - } - } - // Get the score from the random number generator. Make sure we // pick correct random number. Optimize for the case where we // pick in rising order. 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 d9778287b0e..bdc30f0b230 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java @@ -27,8 +27,6 @@ public class NodeState implements Cloneable { private float initProgress = 1.0f; private int minUsedBits = 16; private List<DiskState> diskStates = new ArrayList<>(); - /** When generating ideal states, we want to cheaply check if any disks are down in the nodestate. */ - private boolean anyDiskDown = false; private long startTimestamp = 0; public static float getListingBucketsInitProgressLimit() { return 0.01f; } @@ -36,18 +34,6 @@ public class NodeState implements Cloneable { public NodeState(NodeType type, State state) { this.type = type; this.state = state; - updateAnyDiskDownFlag(); - } - - private void updateAnyDiskDownFlag() { - boolean anyDown = false; - for (DiskState ds : diskStates) { - if (!ds.getState().equals(State.UP)) { - anyDown = true; - break; - } - } - anyDiskDown = anyDown; } public NodeState clone() { @@ -214,7 +200,6 @@ public class NodeState implements Cloneable { public int getMinUsedBits() { return minUsedBits; } public long getStartTimestamp() { return startTimestamp; } - public boolean isAnyDiskDown() { return anyDiskDown; } public int getDiskCount() { return diskStates.size(); } public List<DiskState> getDiskStates() { return Collections.unmodifiableList(diskStates); } @@ -288,7 +273,6 @@ public class NodeState implements Cloneable { public NodeState setDiskState(int disk, DiskState state) throws IndexOutOfBoundsException { diskStates.set(disk, state); - updateAnyDiskDownFlag(); return this; } @@ -465,7 +449,6 @@ public class NodeState implements Cloneable { // Ignore unknown tokens } diskData.addDisk(newState); - newState.updateAnyDiskDownFlag(); return newState; } |