Closed navneet1v closed 2 weeks ago
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
.
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
.
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
.
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
.
Description
Fixing KNNMethodContext resolution when documents are ingested and a flaky test
Bug Fixes:
testDeletedDocsWithSegmentMerge_whenValid_ThenSucceed
. It was added in the PR: https://github.com/opensearch-project/k-NN/pull/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: https://github.com/opensearch-project/k-NN/pull/2046Issue
https://github.com/opensearch-project/k-NN/issues/1949
Check List
--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.