Skip to content
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.

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

Switch away from getMergeInstance for derived source #2472

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

jmazanec15
Copy link
Member

@jmazanec15 jmazanec15 commented Jan 30, 2025

Description

I was running the DerivedSourceIts for the derived source feature in a multi-node setting with replicas and was noticing that getMergeInstance was being called outside of merge when reindex was happening. I couldnt figure out the stack trace, but decided to revert back to wrapping the readers during merge. This fixed it.

It might be getting called in the SequentialStoredFieldsReader in this hack:

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • Commits are signed per the DCO using --signoff.

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.

Copy link
Collaborator

@shatejas shatejas left a comment

Choose a reason for hiding this comment

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

Looks good, I don't see unit tests. Please iterate on it in separate PR

I do think the opensearch core shouldn't be using it in a hacky way. It's violating the interface contract. It would be good to raise this issue so the pattern is not repeated at other places.

Approving for now

@navneet1v navneet1v merged commit abae323 into opensearch-project:2.19 Jan 30, 2025
110 of 123 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to main 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-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport/backport-2472-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 abae323c6204cfc725e124e0c9487f2d3024a08b
# Push it to GitHub
git push --set-upstream origin backport/backport-2472-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 30, 2025
Signed-off-by: John Mazanec <[email protected]>
(cherry picked from commit abae323)
navneet1v pushed a commit that referenced this pull request Jan 31, 2025
Signed-off-by: John Mazanec <[email protected]>
(cherry picked from commit abae323)

Co-authored-by: John Mazanec <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport main backport 2.x Bug Fixes Changes to a system or product designed to handle a programming bug/glitch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants