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

[Backport 2.x] Allow mapping service to be null for scenarios of shard recovery from translog #687

Merged
merged 1 commit into from
Dec 21, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport c412c8a from #685

…m translog (#685)

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit c412c8a)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team December 21, 2022 05:09
@codecov-commenter
Copy link

codecov-commenter commented Dec 21, 2022

Codecov Report

Merging #687 (c412c8a) into 2.x (144a5e8) will decrease coverage by 0.03%.
The diff coverage is 85.60%.

❗ Current head c412c8a differs from pull request most recent head 0766ad1. Consider uploading reports for the commit 0766ad1 to get more accurate results

@@             Coverage Diff              @@
##                2.x     #687      +/-   ##
============================================
- Coverage     84.50%   84.46%   -0.04%     
+ Complexity     1059     1055       -4     
============================================
  Files           149      149              
  Lines          4317     4307      -10     
  Branches        388      385       -3     
============================================
- Hits           3648     3638      -10     
  Misses          489      489              
  Partials        180      180              
Impacted Files Coverage Δ
...n/java/org/opensearch/knn/common/KNNConstants.java 93.33% <ø> (ø)
.../main/java/org/opensearch/knn/index/IndexUtil.java 55.73% <ø> (ø)
...va/org/opensearch/knn/index/KNNCircuitBreaker.java 60.00% <0.00%> (ø)
.../main/java/org/opensearch/knn/index/KNNMethod.java 100.00% <ø> (ø)
...ava/org/opensearch/knn/index/KNNMethodContext.java 92.50% <ø> (ø)
...java/org/opensearch/knn/index/MethodComponent.java 88.88% <ø> (ø)
...g/opensearch/knn/index/MethodComponentContext.java 91.13% <ø> (ø)
...earch/knn/index/memory/NativeMemoryAllocation.java 82.92% <ø> (ø)
.../java/org/opensearch/knn/index/query/KNNQuery.java 83.33% <ø> (ø)
...org/opensearch/knn/index/query/KNNQueryResult.java 100.00% <ø> (ø)
... and 84 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@martin-gaievski martin-gaievski added backport 2.4 backport to 2.4 branch backport 2.3 Backport to 2.3 branch backport 2.2 labels Dec 21, 2022
@martin-gaievski martin-gaievski merged commit 04f677e into 2.x Dec 21, 2022
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

opensearch-trigger-bot bot added a commit that referenced this pull request Dec 21, 2022
…m translog (#685) (#687)

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit c412c8a)

Co-authored-by: Martin Gaievski <[email protected]>
(cherry picked from commit 04f677e)
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@github-actions github-actions bot deleted the backport/backport-685-to-2.x branch December 21, 2022 18:12
martin-gaievski pushed a commit that referenced this pull request Dec 21, 2022
…m translog (#685) (#687) (#688)

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit c412c8a)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
martin-gaievski added a commit to martin-gaievski/k-NN that referenced this pull request Dec 21, 2022
…m translog (opensearch-project#685) (opensearch-project#687)

    Signed-off-by: Martin Gaievski <[email protected]>
    (cherry picked from commit c412c8a)

    Co-authored-by: Martin Gaievski <[email protected]>

Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit to martin-gaievski/k-NN that referenced this pull request Dec 21, 2022
…m translog (opensearch-project#685) (opensearch-project#687)

    Signed-off-by: Martin Gaievski <[email protected]>
    (cherry picked from commit c412c8a)

    Co-authored-by: Martin Gaievski <[email protected]>

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 61f6346)
martin-gaievski added a commit that referenced this pull request Dec 21, 2022
…m translog (#685) (#687) (#689)

Signed-off-by: Martin Gaievski <[email protected]>
    (cherry picked from commit c412c8a)

    Co-authored-by: Martin Gaievski <[email protected]>

Signed-off-by: Martin Gaievski <[email protected]>

Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit that referenced this pull request Dec 21, 2022
…m translog (#685) (#687) (#690)

Signed-off-by: Martin Gaievski <[email protected]>
    (cherry picked from commit c412c8a)

    Co-authored-by: Martin Gaievski <[email protected]>

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 61f6346)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.2 backport 2.3 Backport to 2.3 branch backport 2.4 backport to 2.4 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants