MERGE: Merge branch '3.0' into bugfix/14-realtime-removal

Author: kdambekalns

Classes/Command/NodeIndexQueueCommandController.php

@@ -19,6 +19,7 @@
 
 /**
  * Provides CLI features for index handling
+ *
  * @Flow\Scope("singleton")
  */
 class NodeIndexQueueCommandController extends CommandController
@@ -27,6 +28,7 @@ class NodeIndexQueueCommandController extends CommandController
 
     const BATCH_QUEUE_NAME = 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer';
     const LIVE_QUEUE_NAME = 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live';
+    const DEFAULT_BATCH_SIZE = 500;
 
     /**
      * @var JobManager
@@ -70,6 +72,12 @@ class NodeIndexQueueCommandController extends CommandController
      */
     protected $nodeIndexer;
 
+    /**
+     * @Flow\InjectConfiguration(package="Flowpack.ElasticSearch.ContentRepositoryQueueIndexer")
+     * @var array
+     */
+    protected $settings;
+
     /**
      * Index all nodes by creating a new index and when everything was completed, switch the index alias.
      *
@@ -220,7 +228,7 @@ protected function indexWorkspace($workspaceName, $indexPostfix)
         $this->outputLine('<info>++</info> Indexing %s workspace', [$workspaceName]);
         $nodeCounter = 0;
         $offset = 0;
-        $batchSize = 100;
+        $batchSize = $this->settings['batchSize'] ?? static::DEFAULT_BATCH_SIZE;
         while (true) {
             $iterator = $this->nodeDataRepository->findAllBySiteAndWorkspace($workspaceName, $offset, $batchSize);
 

Configuration/Settings.yaml

@@ -2,7 +2,8 @@ Flowpack:
   ElasticSearch:
     ContentRepositoryQueueIndexer:
       enableLiveAsyncIndexing: true
-
+      # Change size of single batch jobs via this setting (fallback default is 500)
+      # batchSize: 50
   JobQueue:
     Common:
       queues: