From 9dae6d27a832718cc94cd7270e0bb1607d840297 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 13 Nov 2020 16:39:51 +0100 Subject: Higher priority for reindexer, assuming bucket lock --- .../src/main/java/ai/vespa/reindexing/Reindexer.java | 4 ++-- .../src/test/java/ai/vespa/reindexing/ReindexerTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 30e21697a6d..b2f1d833df7 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java @@ -31,7 +31,7 @@ import static java.util.logging.Level.WARNING; /** * Progresses reindexing efforts by creating visitor sessions against its own content cluster, - * which send documents straight to storage — via indexing if the documenet type has "index" mode. + * which send documents straight to storage — via indexing if the documenet type has "index" mode. * The {@link #reindex} method blocks until shutdown is called, or until no more reindexing is left to do. * * @author jonmv @@ -181,7 +181,7 @@ public class Reindexer { parameters.setRemoteDataHandler(cluster.name()); parameters.setResumeToken(progress); parameters.setFieldSet(type.getName() + ":[document]"); - parameters.setPriority(DocumentProtocol.Priority.LOW_1); + parameters.setPriority(DocumentProtocol.Priority.NORMAL_3); parameters.setRoute(cluster.route()); parameters.setBucketSpace(cluster.bucketSpaceOf(type)); // parameters.setVisitorLibrary("ReindexVisitor"); // TODO jonmv: Use when ready, or perhaps an argument to the DumpVisitor is enough? diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java index d8d67bc6993..a5ad2ba32f1 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java @@ -80,7 +80,7 @@ class ReindexerTest { } @Test - void parameters() { + void testParameters() { Reindexer reindexer = new Reindexer(cluster, Map.of(), database, failIfCalled, clock); ProgressToken token = new ProgressToken(); VisitorParameters parameters = reindexer.createParameters(music, token); @@ -90,12 +90,12 @@ class ReindexerTest { assertEquals("[Storage:cluster=cluster;clusterconfigid=id]", parameters.getRoute().toString()); assertEquals("cluster", parameters.getRemoteDataHandler()); assertEquals("music", parameters.getDocumentSelection()); - assertEquals(DocumentProtocol.Priority.LOW_1, parameters.getPriority()); + assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority()); } @Test @Timeout(10) - void testReindexing() throws ReindexingLockException, ExecutionException, InterruptedException { + void testReindexing() throws ReindexingLockException { // Reindexer is told to update "music" documents no earlier than EPOCH, which is just now. // Since "music" is a new document type, it is stored as just reindexed, and nothing else happens. new Reindexer(cluster, Map.of(music, Instant.EPOCH), database, failIfCalled, clock).reindex(); @@ -108,7 +108,7 @@ class ReindexerTest { new Reindexer(cluster, Map.of(music, Instant.ofEpochMilli(10)), database, failIfCalled, clock).reindex(); assertEquals(reindexing, database.readReindexing()); - // It's time to reindex the "music" documents — let this complete successfully. + // It's time to reindex the "music" documents — let this complete successfully. clock.advance(Duration.ofMillis(10)); AtomicBoolean shutDown = new AtomicBoolean(); Executor executor = Executors.newSingleThreadExecutor(); -- cgit v1.2.3