Merge pull request #418 from gradinarufelix/bugfix-retry-on-conflict-in-fulltext-update

BUGFIX: Retry on conflict also in fulltext method and make number of retries configurable

Author: kdambekalns

Classes/Driver/Version6/IndexerDriver.php

@@ -29,6 +29,11 @@
  */
 class IndexerDriver extends AbstractIndexerDriver implements IndexerDriverInterface
 {
+    /**
+     * @Flow\InjectConfiguration(path="indexing.retryOnConflict")
+     * @var int
+     */
+    protected $retryOnConflict = 3;
 
     #[Flow\Inject]
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
@@ -47,7 +52,7 @@ public function document(string $indexName, Node $node, ElasticSearchDocument $d
                     'update' => [
                         '_id' => $document->getId(),
                         '_index' => $indexName,
-                        'retry_on_conflict' => 3
+                        'retry_on_conflict' => $this->retryOnConflict ?: 3
                     ]
                 ],
                 // https://www.elastic.co/guide/en/elasticsearch/reference/5.0/docs-update.html
@@ -75,6 +80,7 @@ public function document(string $indexName, Node $node, ElasticSearchDocument $d
                 'index' => [
                     '_id' => $document->getId(),
                     '_index' => $indexName,
+                    'retry_on_conflict' => $this->retryOnConflict ?: 3
                 ]
             ],
             $documentData
@@ -105,7 +111,8 @@ public function fulltext(Node $node, array $fulltextIndexOfNode, ?WorkspaceName
         return [
             [
                 'update' => [
-                    '_id' => $closestFulltextNodeDocumentIdentifier
+                    '_id' => $closestFulltextNodeDocumentIdentifier,
+                    'retry_on_conflict' => $this->retryOnConflict ?: 3
                 ]
             ],
             // https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update.html

Configuration/Settings.yaml

@@ -4,6 +4,7 @@ Flowpack:
       command:
         useSubProcesses: true
       indexing:
+        retryOnConflict: 3
         batchSize:
           elements: 500
           octets: 40000000