hsearch-es: Add options to configure indexing queues

yrodiere · Apr 2, 2020 · 92c6e40 · 92c6e40
1 parent 7b485d9
commit 92c6e40
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/.../quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/.../quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
@@ -156,6 +156,15 @@ private void contributeBackendRuntimeProperties(BiConsumer<String, Object> prope
                     ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT,
                     elasticsearchBackendConfig.indexDefaults.schemaManagement.requiredStatusWaitTimeout, Optional::isPresent,
                     d -> d.get().toMillis());
+            addBackendDefaultIndexConfig(propertyCollector, backendName,
+                    ElasticsearchIndexSettings.INDEXING_QUEUE_COUNT,
+                    elasticsearchBackendConfig.indexDefaults.indexing.queueCount);
+            addBackendDefaultIndexConfig(propertyCollector, backendName,
+                    ElasticsearchIndexSettings.INDEXING_QUEUE_SIZE,
+                    elasticsearchBackendConfig.indexDefaults.indexing.queueSize);
+            addBackendDefaultIndexConfig(propertyCollector, backendName,
+                    ElasticsearchIndexSettings.INDEXING_MAX_BULK_SIZE,
+                    elasticsearchBackendConfig.indexDefaults.indexing.maxBulkSize);
 
             for (Entry<String, ElasticsearchIndexConfig> indexConfigEntry : runtimeConfig.defaultBackend.indexes.entrySet()) {
                 String indexName = indexConfigEntry.getKey();
@@ -168,6 +177,15 @@ private void contributeBackendRuntimeProperties(BiConsumer<String, Object> prope
                         ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT,
                         indexConfig.schemaManagement.requiredStatusWaitTimeout, Optional::isPresent,
                         d -> d.get().toMillis());
+                addBackendIndexConfig(propertyCollector, backendName, indexName,
+                        ElasticsearchIndexSettings.INDEXING_QUEUE_COUNT,
+                        indexConfig.indexing.queueCount);
+                addBackendIndexConfig(propertyCollector, backendName, indexName,
+                        ElasticsearchIndexSettings.INDEXING_QUEUE_SIZE,
+                        indexConfig.indexing.queueSize);
+                addBackendIndexConfig(propertyCollector, backendName, indexName,
+                        ElasticsearchIndexSettings.INDEXING_MAX_BULK_SIZE,
+                        indexConfig.indexing.maxBulkSize);
             }
         }
     }

diff --git a/...kus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java b/...kus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java
@@ -180,6 +180,12 @@ public static class ElasticsearchIndexConfig {
          */
         @ConfigItem
         ElasticsearchIndexSchemaManagementConfig schemaManagement;
+
+        /**
+         * Configuration for the indexing process that creates, updates and deletes documents.
+         */
+        @ConfigItem
+        ElasticsearchIndexIndexingConfig indexing;
     }
 
     @ConfigGroup
@@ -455,4 +461,30 @@ public static class ElasticsearchIndexSchemaManagementConfig {
         @ConfigItem(defaultValueDocumentation = "10S")
         Optional<Duration> requiredStatusWaitTimeout;
     }
+
+    // We can't set actual default values in this section,
+    // otherwise "quarkus.hibernate-search.elasticsearch.index-defaults" will be ignored.
+    @ConfigGroup
+    public static class ElasticsearchIndexIndexingConfig {
+        /**
+         * The number of indexing queues assigned to each index.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "10")
+        OptionalInt queueCount;
+
+        /**
+         * The size of indexing queues.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "1000")
+        OptionalInt queueSize;
+
+        /**
+         * The maximum size of bulk requests created when processing indexing queues.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "100")
+        OptionalInt maxBulkSize;
+    }
 }