diff options
author | Harald Musum <musum@yahooinc.com> | 2023-07-03 23:43:29 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-07-03 23:43:29 +0200 |
commit | 8a5eafdae4bd65a7c70002184c6bbb80e558377f (patch) | |
tree | f2d9ba80718026956ee514e4b4961efb2b4911ed | |
parent | 86bd836d889e6648f459701fe8fec7e5a364afd6 (diff) |
Reindent
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java | 143 |
1 files changed, 73 insertions, 70 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java index e2166b263ee..d870ec0e6a9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java @@ -12,6 +12,7 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.utils.Duration; import org.w3c.dom.Element; + import java.util.Optional; /** @@ -49,8 +50,8 @@ public class ClusterControllerConfig extends AnyConfigProducer implements Fleetc } var tuningConfig = new ClusterControllerTuningBuilder(clusterControllerTuning, - minNodeRatioPerGroup, - bucketSplittingMinimumBits) + minNodeRatioPerGroup, + bucketSplittingMinimumBits) .build(); if (ancestor instanceof ContentCluster) { int numberOfLeafGroups = ((ContentCluster) ancestor).getRootGroup().getNumberOfLeafGroups(); @@ -74,6 +75,7 @@ public class ClusterControllerConfig extends AnyConfigProducer implements Fleetc resourceLimits, allowMoreThanOneContentGroupDown); } + } private final String clusterName; @@ -122,79 +124,80 @@ public class ClusterControllerConfig extends AnyConfigProducer implements Fleetc public ClusterControllerTuning tuning() {return tuning;} -private static class ClusterControllerTuningBuilder { - - private final Optional<Double> minNodeRatioPerGroup; - private final Optional<Duration> initProgressTime; - private final Optional<Duration> transitionTime; - private final Optional<Long> maxPrematureCrashes; - private final Optional<Duration> stableStateTimePeriod; - private final Optional<Double> minDistributorUpRatio; - private final Optional<Double> minStorageUpRatio; - private final Optional<Integer> minSplitBits; - final Optional<Integer> maxGroupsAllowedDown; - - ClusterControllerTuningBuilder(ModelElement tuning, - Optional<Double> minNodeRatioPerGroup, - Optional<Integer> bucketSplittingMinimumBits) { - this.minSplitBits = bucketSplittingMinimumBits; - this.minNodeRatioPerGroup = minNodeRatioPerGroup; - if (tuning == null) { - this.initProgressTime = Optional.empty(); - this.transitionTime = Optional.empty(); - this.maxPrematureCrashes = Optional.empty(); - this.stableStateTimePeriod = Optional.empty(); - this.minDistributorUpRatio = Optional.empty(); - this.minStorageUpRatio = Optional.empty(); - this.maxGroupsAllowedDown = Optional.empty(); - } else { - this.initProgressTime = Optional.ofNullable(tuning.childAsDuration("init-progress-time")); - this.transitionTime = Optional.ofNullable(tuning.childAsDuration("transition-time")); - this.maxPrematureCrashes = Optional.ofNullable(tuning.childAsLong("max-premature-crashes")); - this.stableStateTimePeriod = Optional.ofNullable(tuning.childAsDuration("stable-state-period")); - this.minDistributorUpRatio = Optional.ofNullable(tuning.childAsDouble("min-distributor-up-ratio")); - this.minStorageUpRatio = Optional.ofNullable(tuning.childAsDouble("min-storage-up-ratio")); - this.maxGroupsAllowedDown = Optional.ofNullable(tuning.childAsInteger("max-groups-allowed-down")); + private static class ClusterControllerTuningBuilder { + + private final Optional<Double> minNodeRatioPerGroup; + private final Optional<Duration> initProgressTime; + private final Optional<Duration> transitionTime; + private final Optional<Long> maxPrematureCrashes; + private final Optional<Duration> stableStateTimePeriod; + private final Optional<Double> minDistributorUpRatio; + private final Optional<Double> minStorageUpRatio; + private final Optional<Integer> minSplitBits; + final Optional<Integer> maxGroupsAllowedDown; + + ClusterControllerTuningBuilder(ModelElement tuning, + Optional<Double> minNodeRatioPerGroup, + Optional<Integer> bucketSplittingMinimumBits) { + this.minSplitBits = bucketSplittingMinimumBits; + this.minNodeRatioPerGroup = minNodeRatioPerGroup; + if (tuning == null) { + this.initProgressTime = Optional.empty(); + this.transitionTime = Optional.empty(); + this.maxPrematureCrashes = Optional.empty(); + this.stableStateTimePeriod = Optional.empty(); + this.minDistributorUpRatio = Optional.empty(); + this.minStorageUpRatio = Optional.empty(); + this.maxGroupsAllowedDown = Optional.empty(); + } + else { + this.initProgressTime = Optional.ofNullable(tuning.childAsDuration("init-progress-time")); + this.transitionTime = Optional.ofNullable(tuning.childAsDuration("transition-time")); + this.maxPrematureCrashes = Optional.ofNullable(tuning.childAsLong("max-premature-crashes")); + this.stableStateTimePeriod = Optional.ofNullable(tuning.childAsDuration("stable-state-period")); + this.minDistributorUpRatio = Optional.ofNullable(tuning.childAsDouble("min-distributor-up-ratio")); + this.minStorageUpRatio = Optional.ofNullable(tuning.childAsDouble("min-storage-up-ratio")); + this.maxGroupsAllowedDown = Optional.ofNullable(tuning.childAsInteger("max-groups-allowed-down")); + } + } + + private ClusterControllerTuning build() { + return new ClusterControllerTuning(initProgressTime, + transitionTime, + maxPrematureCrashes, + stableStateTimePeriod, + minDistributorUpRatio, + minStorageUpRatio, + maxGroupsAllowedDown, + minNodeRatioPerGroup, + minSplitBits); } - } - private ClusterControllerTuning build() { - return new ClusterControllerTuning(initProgressTime, - transitionTime, - maxPrematureCrashes, - stableStateTimePeriod, - minDistributorUpRatio, - minStorageUpRatio, - maxGroupsAllowedDown, - minNodeRatioPerGroup, - minSplitBits); } -} + private record ClusterControllerTuning(Optional<Duration> initProgressTime, + Optional<Duration> transitionTime, + Optional<Long> maxPrematureCrashes, + Optional<Duration> stableStateTimePeriod, + Optional<Double> minDistributorUpRatio, + Optional<Double> minStorageUpRatio, + Optional<Integer> maxGroupsAllowedDown, + Optional<Double> minNodeRatioPerGroup, + Optional<Integer> minSplitBits) { + + public ClusterControllerTuning withMaxGroupsAllowedDown(int maxGroupsAllowedDown) { + return new ClusterControllerConfig.ClusterControllerTuning( + initProgressTime, + transitionTime, + maxPrematureCrashes, + stableStateTimePeriod, + minDistributorUpRatio, + minStorageUpRatio, + Optional.of(maxGroupsAllowedDown), + minNodeRatioPerGroup, + minSplitBits); + } -private record ClusterControllerTuning(Optional<Duration> initProgressTime, - Optional<Duration> transitionTime, - Optional<Long> maxPrematureCrashes, - Optional<Duration> stableStateTimePeriod, - Optional<Double> minDistributorUpRatio, - Optional<Double> minStorageUpRatio, - Optional<Integer> maxGroupsAllowedDown, - Optional<Double> minNodeRatioPerGroup, - Optional<Integer> minSplitBits) { - - public ClusterControllerTuning withMaxGroupsAllowedDown(int maxGroupsAllowedDown) { - return new ClusterControllerConfig.ClusterControllerTuning( - initProgressTime, - transitionTime, - maxPrematureCrashes, - stableStateTimePeriod, - minDistributorUpRatio, - minStorageUpRatio, - Optional.of(maxGroupsAllowedDown), - minNodeRatioPerGroup, - minSplitBits); } } - -} |