Skip to content

[BugFix] Fixing KNNMethodContext resolution when documents are ingested and a flaky test#2072

Merged
navneet1v merged 1 commit intoopensearch-project:mainfrom
navneet1v:bug-fix
Sep 9, 2024
Merged

[BugFix] Fixing KNNMethodContext resolution when documents are ingested and a flaky test#2072
navneet1v merged 1 commit intoopensearch-project:mainfrom
navneet1v:bug-fix

Conversation

@navneet1v
Copy link
Collaborator

@navneet1v navneet1v commented Sep 9, 2024

Description

Fixing KNNMethodContext resolution when documents are ingested and a flaky test

Bug Fixes:

  1. When mode and compression is provided and documents are ingested, the rescore parameter was not getting passed in during search, as in the FieldMapper mergeBuilder Mode and compression attributes were not getting set.
  2. There was a flaky test testDeletedDocsWithSegmentMerge_whenValid_ThenSucceed. It was added in the PR: Fix the force merge with Quantization failures when a segment has deleted docs in it #2046 to test that merges are happening without any failures. But as this test was doing search at the end it is not necessary that search will always give consistent results as the documents are deleted. Hence the correct test for this is ensuring the index is green after the merge. The flakiness was observed here: Fix the force merge with Quantization failures when a segment has deleted docs in it #2046

Issue

#1949

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • 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.

@navneet1v navneet1v merged commit 8f6b177 into opensearch-project:main Sep 9, 2024
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2072-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2072-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

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

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

navneet1v added a commit that referenced this pull request Sep 9, 2024
…ed and a flaky test (#2072)

Signed-off-by: Navneet Verma <[email protected]>
(cherry picked from commit 8f6b177)
naveentatikonda pushed a commit that referenced this pull request Sep 9, 2024
…ed and a flaky test (#2072) (#2075)

Signed-off-by: Navneet Verma <[email protected]>
(cherry picked from commit 8f6b177)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 9, 2024
…ed and a flaky test (#2072) (#2075)

Signed-off-by: Navneet Verma <[email protected]>
(cherry picked from commit 8f6b177)
(cherry picked from commit 0eaa5a0)
navneet1v added a commit that referenced this pull request Sep 9, 2024
…ed and a flaky test (#2072) (#2075) (#2077)

Signed-off-by: Navneet Verma <[email protected]>
(cherry picked from commit 8f6b177)
(cherry picked from commit 0eaa5a0)

Co-authored-by: Navneet Verma <[email protected]>
jingqimao77-spec pushed a commit to jingqimao77-spec/k-NN that referenced this pull request Mar 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants