TASK: Improve batch size settings handling

Instead of using a class constant and programmatic fallback handling,
simply define the default using `Settings.yaml`.

Author: kdambekalns

Classes/Command/NodeIndexQueueCommandController.php

@@ -28,7 +28,6 @@ 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
@@ -73,10 +72,10 @@ class NodeIndexQueueCommandController extends CommandController
     protected $nodeIndexer;
 
     /**
-     * @Flow\InjectConfiguration(package="Flowpack.ElasticSearch.ContentRepositoryQueueIndexer")
-     * @var array
+     * @Flow\InjectConfiguration(path="batchSize")
+     * @var int
      */
-    protected $settings;
+    protected $batchSize;
 
     /**
      * Index all nodes by creating a new index and when everything was completed, switch the index alias.
@@ -228,9 +227,8 @@ protected function indexWorkspace($workspaceName, $indexPostfix)
         $this->outputLine('<info>++</info> Indexing %s workspace', [$workspaceName]);
         $nodeCounter = 0;
         $offset = 0;
-        $batchSize = $this->settings['batchSize'] ?? static::DEFAULT_BATCH_SIZE;
         while (true) {
-            $iterator = $this->nodeDataRepository->findAllBySiteAndWorkspace($workspaceName, $offset, $batchSize);
+            $iterator = $this->nodeDataRepository->findAllBySiteAndWorkspace($workspaceName, $offset, $this->batchSize);
 
             $jobData = [];
 
@@ -252,7 +250,7 @@ protected function indexWorkspace($workspaceName, $indexPostfix)
             $indexingJob = new IndexingJob($indexPostfix, $workspaceName, $jobData);
             $this->jobManager->queue(self::BATCH_QUEUE_NAME, $indexingJob);
             $this->output('.');
-            $offset += $batchSize;
+            $offset += $this->batchSize;
             $this->persistenceManager->clearState();
         }
         $this->outputLine();

Configuration/Settings.yaml

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