diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-12-16 21:36:04 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-12-16 21:36:04 +0100 |
| commit | 25482ac78b972d3f67b86fceb4a6bedaef07f2a2 (patch) | |
| tree | c1e2932e808f1babf0dd4bc5ff81e36e22df470a /config-model | |
| parent | 7f04f3a850619c73ea25aab853ff7ec1ea71e707 (diff) | |
Revert "Merge pull request #20557 from vespa-engine/revert-20556-jonmv/tune-reindexing"
This reverts commit 7f04f3a850619c73ea25aab853ff7ec1ea71e707, reversing
changes made to 0d69641750f500685d2e246022a6ef21d34ac85d.
Diffstat (limited to 'config-model')
2 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index 8cdeda0e85f..eafc460bfb5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -177,7 +177,8 @@ public class ClusterControllerContainer extends Container implements status -> clusterBuilder.documentTypes( typeName, new ReindexingConfig.Clusters.DocumentTypes.Builder() - .readyAtMillis(status.ready().toEpochMilli()))); + .readyAtMillis(status.ready().toEpochMilli()) + .speed(status.speed()))); } builder.clusters(clusterId, clusterBuilder); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java index fcec74e0ec9..4b63d837039 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java @@ -505,6 +505,7 @@ public class ClusterControllerTestCase extends DomBuilderTest { assertEquals(1, reindexingConfig.clusters().size()); String contentClusterId = "bar"; assertEquals(Instant.EPOCH.toEpochMilli(), reindexingConfig.clusters(contentClusterId).documentTypes("type1").readyAtMillis()); + assertEquals(1.0, reindexingConfig.clusters(contentClusterId).documentTypes("type1").speed()); } private static void assertReindexingConfiguredOnAdminCluster(VespaModel model) { |