summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java
diff options
context:
space:
mode:
Diffstat (limited to 'clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java
index 07586569bf5..e6ce1df2b48 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AggregatedStatsMergePendingChecker.java
@@ -1,10 +1,6 @@
// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.clustercontroller.core;
-import com.yahoo.document.FixedBucketSpaces;
-
-import java.util.Iterator;
-
/**
* Class checking whether a particular bucket space on a content node might have buckets pending.
*
@@ -13,9 +9,12 @@ import java.util.Iterator;
public class AggregatedStatsMergePendingChecker implements MergePendingChecker {
private final AggregatedClusterStats stats;
+ private final double minMergeCompletionRatio;
- public AggregatedStatsMergePendingChecker(AggregatedClusterStats stats) {
+ public AggregatedStatsMergePendingChecker(AggregatedClusterStats stats,
+ double minMergeCompletionRatio) {
this.stats = stats;
+ this.minMergeCompletionRatio = minMergeCompletionRatio;
}
@Override
@@ -26,7 +25,8 @@ public class AggregatedStatsMergePendingChecker implements MergePendingChecker {
ContentNodeStats nodeStats = stats.getStats().getContentNode(contentNodeIndex);
if (nodeStats != null) {
ContentNodeStats.BucketSpaceStats bucketSpaceStats = nodeStats.getBucketSpace(bucketSpace);
- return (bucketSpaceStats != null && bucketSpaceStats.mayHaveBucketsPending());
+ return (bucketSpaceStats != null &&
+ bucketSpaceStats.mayHaveBucketsPending(minMergeCompletionRatio));
}
return true;
}