Extract WaitAckCache to deduplicate OpenSearch bulk response handling#1869
Merged
Extract WaitAckCache to deduplicate OpenSearch bulk response handling#1869
Conversation
…rch bolts The waitAck cache logic and bulk response processing were duplicated across DeletionBolt, IndexerBolt, and StatusUpdaterBolt. This extracts the shared logic into a new WaitAckCache class and adds unit tests covering the core scenarios (success, failure, conflicts, eviction, duplicate doc IDs). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
5 tasks
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
… working in my spare time) Signed-off-by: Julien Nioche <julien@digitalpebble.com>
rzo1
approved these changes
Apr 6, 2026
| best = item; | ||
| } | ||
| } | ||
| if (failedCount > 0 && failedCount < items.size()) { |
Contributor
There was a problem hiding this comment.
If all items are failed, best stays as items.get(0) (a failed item), which is actually correct behaviour but the warning only fires when there's a mix. If there are multiple failed items for the same ID, no warning is logged and the first one is silently used. Not a bug per se, but worth a comment.
|
|
||
| @Override | ||
| public void afterBulk(long executionId, BulkRequest request, BulkResponse response) { | ||
| var idsToBulkItemsWithFailedFlag = |
Contributor
There was a problem hiding this comment.
In the old DeletionBolt, a conflict was silently ignored (just LOG.debug). The new shared path in processBulkResponse also only logs at debug. That's fine. But the IndexerBolt path previously incremented eventCounter.scope("doc_conflicts") that counter now comes from the conflictCounter parameter, which DeletionBolt passes as null. So deletion conflicts are no longer counted anywhere. If that's intentional it should be documented; if not, it's a regression.
external/opensearch/src/test/java/org/apache/stormcrawler/opensearch/WaitAckCacheTest.java
Outdated
Show resolved
Hide resolved
external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/WaitAckCache.java
Show resolved
Hide resolved
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
Contributor
Author
|
@rzo1 I pushed a commit addressing some of the comments in your review. thanks for this! |
Contributor
|
Works for me. We need to resolve the conflict and move on as you suggested. |
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
dpol1
added a commit
to dpol1/stormcrawler
that referenced
this pull request
Apr 10, 2026
This commit aligns the opensearch-java module with recent legacy updates, completes the migration to HC5/API 3.x, and cleans up duplicated resources. Refactors and Alignment: - Ported DelegateRefresher for dynamic config reloading (apache#1870). - Adopted Storm V2 metrics bridge via CrawlerMetrics (apache#1846). - Aligned log messages and metric scopes to OpenSearch (apache#1871). - Ported WaitAckCache extraction to centralize bulk-ack logic (apache#1869). - Fixed a race condition in IndexerBolt by inverting the execution order, ensuring tuples are registered in waitAck before bulk dispatch. - Refactored BulkItemResponseToFailedFlag to a Java record with a compact constructor for strict null-safety. Maintenance and Cleanup: - Removed duplicated archetype, dashboards, and opensearch-conf.yaml to prevent maintenance overhead. - Updated README with a migration guide pointing to legacy resources. - Removed dead rat-exclude in root pom.xml.
dpol1
added a commit
to dpol1/stormcrawler
that referenced
this pull request
Apr 10, 2026
This commit aligns the opensearch-java module with recent legacy updates, completes the migration to HC5/API 3.x, and cleans up duplicated resources. Refactors and Alignment: - Ported DelegateRefresher for dynamic config reloading (apache#1870). - Adopted Storm V2 metrics bridge via CrawlerMetrics (apache#1846). - Aligned log messages and metric scopes to OpenSearch (apache#1871). - Ported WaitAckCache extraction to centralize bulk-ack logic (apache#1869). - Fixed a race condition in IndexerBolt by inverting the execution order, ensuring tuples are registered in waitAck before bulk dispatch. - Refactored BulkItemResponseToFailedFlag to a Java record with a compact constructor for strict null-safety. Maintenance and Cleanup: - Removed duplicated archetype, dashboards, and opensearch-conf.yaml to prevent maintenance overhead. - Updated README with a migration guide pointing to legacy resources. - Removed dead rat-exclude in root pom.xml.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DeletionBolt,IndexerBolt, andStatusUpdaterBoltinto a new sharedWaitAckCacheclassWaitAckCachecovering success, failure, conflicts, eviction, duplicate doc IDs (Elasticsearch IndexerBolt: tuples with canonical URL may not get acked #832), and edge cases — no OpenSearch container neededTest plan
mvn test -pl external/opensearch -Dtest=WaitAckCacheTest— all 11 new unit tests passmvn compile -pl external/opensearch -am— clean compileIndexerBoltTest,StatusBoltTest) pass against OpenSearch container🤖 Generated with Claude Code