summaryrefslogtreecommitdiffstats
path: root/clustercontroller-reindexer/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-18 07:13:53 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2023-01-18 07:13:53 +0100
commit592674c7317fd1e97107ed700fb7a039ef9365a7 (patch)
tree20a129c1f77a137c5c9d6cc2404ccc9b8743002d /clustercontroller-reindexer/src
parent88a74a85691ee861f89669954a317781db000ab9 (diff)
Just use Streams.toList as that is unmdifiable.
Diffstat (limited to 'clustercontroller-reindexer/src')
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java3
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java5
2 files changed, 3 insertions, 5 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
index 246092034de..92b5e56ac08 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -32,7 +32,6 @@ import static java.util.Objects.requireNonNull;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
-import static java.util.stream.Collectors.toUnmodifiableList;
/**
* Progresses reindexing efforts by creating visitor sessions against its own content cluster,
@@ -82,7 +81,7 @@ public class Reindexer {
this.cluster = cluster;
this.ready = ready.stream() // Iterate through document types in consistent order.
.sorted(comparingDouble(Trigger::speed).reversed().thenComparing(Trigger::readyAt).thenComparing(Trigger::type))
- .collect(toUnmodifiableList());
+ .toList();
this.database = database;
this.visitorSessions = visitorSessions;
this.metrics = new ReindexingMetrics(metric, cluster.name);
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
index 42555e38326..0a1fdb32a84 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
@@ -32,7 +32,6 @@ import java.util.stream.Stream;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.WARNING;
import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toUnmodifiableList;
/**
* Runs in all cluster controller containers, and progresses reindexing efforts.
@@ -70,7 +69,7 @@ public class ReindexingMaintainer extends AbstractComponent {
access,
metric,
clock))
- .collect(toUnmodifiableList());
+ .toList();
this.executor = new ScheduledThreadPoolExecutor(reindexingConfig.clusters().size(), new DaemonThreadFactory("reindexer-"));
if (reindexingConfig.enabled())
scheduleStaggered((delayMillis, intervalMillis) -> executor.scheduleAtFixedRate(this::maintain, delayMillis, intervalMillis, TimeUnit.MILLISECONDS),
@@ -123,7 +122,7 @@ public class ReindexingMaintainer extends AbstractComponent {
.map(typeStatus -> new Trigger(manager.getDocumentType(typeStatus.getKey()),
Instant.ofEpochMilli(typeStatus.getValue().readyAtMillis()),
typeStatus.getValue().speed()))
- .collect(toUnmodifiableList());
+ .toList();
}
/** Schedules a task with the given interval (across all containers in this ZK cluster). */