Skip to content

[backport camel-4.18.x] CAMEL-24622: camel-infinispan - keep completed exchanges for recovery - #26141

Merged
gnodet merged 1 commit into
camel-4.18.xfrom
backport/26115-to-camel-4.18.x
Sep 5, 2026
Merged

[backport camel-4.18.x] CAMEL-24622: camel-infinispan - keep completed exchanges for recovery#26141
gnodet merged 1 commit into
camel-4.18.xfrom
backport/26115-to-camel-4.18.x

Conversation

@gnodet

@gnodet gnodet commented Sep 5, 2026

Copy link
Copy Markdown
Contributor

Backport of #26115

Cherry-pick of d4539d7 to camel-4.18.x.
Conflicts resolved automatically by backport bot agent.

Conflict resolution

The upgrade guide note was moved from camel-4x-upgrade-guide-4_23.adoc (does not exist on camel-4.18.x) to camel-4x-upgrade-guide-4_18.adoc.

@gnodet gnodet added the backport indicate that a Pull request is a backport from a fix from the main branch label Sep 5, 2026
@gnodet gnodet added the backport indicate that a Pull request is a backport from a fix from the main branch label Sep 5, 2026

@gnodet gnodet left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean backport of CAMEL-24622. The fix correctly implements the RecoverableAggregationRepository contract — follows the same pattern as JdbcAggregationRepository (separate completed store keyed by exchange ID, as opposed to the broken previous behavior where scan() returned in-progress correlation keys and remove() deleted the exchange outright).

Key points verified:

  • remove() correctly moves the completed exchange from correlation-key storage into recovery storage (camel-recovery:<exchangeId>) instead of deleting it
  • confirm() correctly deletes from recovery storage using the prefixed key
  • scan() correctly filters to recovery entries only and strips the prefix to return exchange IDs
  • getKeys() correctly filters out recovery entries so the aggregation framework only sees in-progress aggregations
  • Tests are comprehensive: confirm lifecycle, scan semantics, recover lookup, and a new testGetKeysIgnoresExchangesToRecover test — both embedded and remote
  • Upgrade guide note correctly moved to camel-4x-upgrade-guide-4_18.adoc for the backport

Metadata: No milestone set — suggest 4.18.5.

This review was generated by an AI agent, Hermès on behalf of @gnodet.

@davsclaus davsclaus added this to the 4.18.4 milestone Sep 5, 2026
@davsclaus davsclaus added the bug Something isn't working label Sep 5, 2026
@gnodet
gnodet merged commit b473986 into camel-4.18.x Sep 5, 2026
3 checks passed
@gnodet
gnodet deleted the backport/26115-to-camel-4.18.x branch September 5, 2026 16:30
@davsclaus davsclaus modified the milestones: 4.18.4, 4.18.5 Sep 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport indicate that a Pull request is a backport from a fix from the main branch bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants