Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Classes/Driver/Version6/IndexerDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
*/
class IndexerDriver extends AbstractIndexerDriver implements IndexerDriverInterface
{
/**
* @Flow\InjectConfiguration(path="indexing.retryOnConflict")
* @var int
*/
protected $retryOnConflict = 3;

/**
* {@inheritdoc}
Expand All @@ -43,7 +48,7 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
'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
Expand Down Expand Up @@ -71,6 +76,7 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
'index' => [
'_id' => $document->getId(),
'_index' => $indexName,
'retry_on_conflict' => $this->retryOnConflict ?: 3
]
],
$documentData
Expand Down Expand Up @@ -108,7 +114,8 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, ?strin
return [
[
'update' => [
'_id' => $closestFulltextNodeDocumentIdentifier
'_id' => $closestFulltextNodeDocumentIdentifier,
'retry_on_conflict' => $this->retryOnConflict ?: 3
]
],
// https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update.html
Expand Down
1 change: 1 addition & 0 deletions Configuration/Settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Flowpack:
command:
useSubProcesses: true
indexing:
retryOnConflict: 3
batchSize:
elements: 500
octets: 40000000
Expand Down