diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-04-20 11:03:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 11:03:59 +0200 |
| commit | 33c94080e9f5e1672bfbd8ceb66cd550f2e91815 (patch) | |
| tree | 2036b1fd3095e24c7cc8ca01b13e9262736367a2 /config-model/src/main/java | |
| parent | fc42198ff5fa73efb15c7c6614791245ad3e1020 (diff) | |
| parent | b105eead1fbbcefbb85bc962749f2a12fa660bbe (diff) | |
Merge pull request #11943 from vespa-engine/hakonhall/remove-use-bucket-space-metric-feature-flag
Remove use-bucket-space-metric feature flag
Diffstat (limited to 'config-model/src/main/java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java | 14 |
1 files changed, 4 insertions, 10 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 adff10ae580..43ef37d311d 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 @@ -40,8 +40,6 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F bucketSplittingMinimumBits = clusterTuning.childAsInteger("bucket-splitting.minimum-bits"); } - boolean useBucketSpaceMetric = deployState.getProperties().useBucketSpaceMetric(); - if (tuning != null) { return new ClusterControllerConfig(ancestor, clusterName, tuning.childAsDuration("init-progress-time"), @@ -51,11 +49,11 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F tuning.childAsDouble("min-distributor-up-ratio"), tuning.childAsDouble("min-storage-up-ratio"), bucketSplittingMinimumBits, - minNodeRatioPerGroup, - useBucketSpaceMetric); + minNodeRatioPerGroup + ); } else { return new ClusterControllerConfig(ancestor, clusterName, null, null, null, null, null, null, - bucketSplittingMinimumBits, minNodeRatioPerGroup, useBucketSpaceMetric); + bucketSplittingMinimumBits, minNodeRatioPerGroup); } } } @@ -69,7 +67,6 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F Double minStorageUpRatio; Integer minSplitBits; private Double minNodeRatioPerGroup; - private boolean useBucketSpaceMetric; // TODO refactor; too many args private ClusterControllerConfig(AbstractConfigProducer parent, @@ -81,8 +78,7 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F Double minDistributorUpRatio, Double minStorageUpRatio, Integer minSplitBits, - Double minNodeRatioPerGroup, - boolean useBucketSpaceMetric) { + Double minNodeRatioPerGroup) { super(parent, "fleetcontroller"); this.clusterName = clusterName; @@ -94,7 +90,6 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F this.minStorageUpRatio = minStorageUpRatio; this.minSplitBits = minSplitBits; this.minNodeRatioPerGroup = minNodeRatioPerGroup; - this.useBucketSpaceMetric = useBucketSpaceMetric; } @Override @@ -111,7 +106,6 @@ public class ClusterControllerConfig extends AbstractConfigProducer implements F builder.index(0); builder.cluster_name(clusterName); builder.fleet_controller_count(getChildren().size()); - builder.determine_buckets_from_bucket_space_metric(useBucketSpaceMetric); if (initProgressTime != null) { builder.init_progress_time((int) initProgressTime.getMilliSeconds()); |