Skip to content

Additional thread synchronization in the AggregateProcessor to prevent orphaned aggregate groups#6439

Merged
dlvenable merged 1 commit into
opensearch-project:mainfrom
dlvenable:aggregate-processor-sync-fixes
Jan 28, 2026
Merged

Additional thread synchronization in the AggregateProcessor to prevent orphaned aggregate groups#6439
dlvenable merged 1 commit into
opensearch-project:mainfrom
dlvenable:aggregate-processor-sync-fixes

Conversation

@dlvenable

Copy link
Copy Markdown
Member

Description

We are seeing cases where aggregations are not acknowledging completion. From investigation, I can see that there are places where we can have orphaned aggregate groups. Basically, some code paths can create two aggregate groups and only one remains in the map.

This PR adds tight synchronization on each AggregateProcessor to prevent these possible duplicates or orphans.

We may be able to improve this later. But, for now, this should fix the current issue.

Issues Resolved

N/A

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…revent duplicate or orphaned aggregate groups.

Signed-off-by: David Venable <dlv@amazon.com>
@dlvenable dlvenable merged commit 72ad012 into opensearch-project:main Jan 28, 2026
50 of 52 checks passed
@dlvenable dlvenable deleted the aggregate-processor-sync-fixes branch January 28, 2026 23:40
simonelbaz pushed a commit to simonelbaz/data-prepper that referenced this pull request Jan 31, 2026
…revent duplicate or orphaned aggregate groups. (opensearch-project#6439)

Signed-off-by: David Venable <dlv@amazon.com>
Signed-off-by: Simon ELBAZ <elbazsimon9@gmail.com>
simonelbaz pushed a commit to simonelbaz/data-prepper that referenced this pull request Jan 31, 2026
…revent duplicate or orphaned aggregate groups. (opensearch-project#6439)

Signed-off-by: David Venable <dlv@amazon.com>
simonelbaz pushed a commit to simonelbaz/data-prepper that referenced this pull request Jan 31, 2026
…revent duplicate or orphaned aggregate groups. (opensearch-project#6439)

Signed-off-by: David Venable <dlv@amazon.com>
@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor

The backport to 2.13 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-6439-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 72ad01221742716c4c1de8ea0b095cf0cf3dd682
# Push it to GitHub
git push --set-upstream origin backport/backport-6439-to-2.13
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.13

Then, create a pull request where the base branch is 2.13 and the compare/head branch is backport/backport-6439-to-2.13.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants