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

BWC (rag processor): add version control for newly added request params #3125

Merged
merged 7 commits into from
Jan 9, 2025

Conversation

pyek-bot
Copy link
Contributor

@pyek-bot pyek-bot commented Oct 17, 2024

Description

This change handles backward compatibility when upgrading from 2.12 to any version above it.
It has only been implemented upto 2.16 due to a certain divergence with the bedrock cohere support.
Eventually, it will be ported to 2.17 as well.

Related Issues

It is related to this issue #2983 and handles bwc from these 2 commits:

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@pyek-bot
Copy link
Contributor Author

Please add backport label upto 2.13.

DO NOT merge backport PRs of this fix for 2.14 and 2.13 until the below change is merged and backported successfully:
#3123

@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env October 21, 2024 20:04 — with GitHub Actions Failure
Zhangxunmt
Zhangxunmt previously approved these changes Oct 21, 2024
@b4sjoo
Copy link
Collaborator

b4sjoo commented Oct 29, 2024

UT failed

Signed-off-by: Pavan Yekbote <[email protected]>
@b4sjoo b4sjoo merged commit 40c4e68 into opensearch-project:2.16 Jan 9, 2025
16 of 19 checks passed
@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-3125-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 40c4e680e9ff9053b6f8ce718a31caca29c5e7d2
# Push it to GitHub
git push --set-upstream origin backport/backport-3125-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-3125-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)
@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)
@opensearch-trigger-bot
Copy link
Contributor

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

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

dhrubo-os pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125) (#3363)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)

Co-authored-by: Pavan Yekbote <[email protected]>
dhrubo-os pushed a commit that referenced this pull request Jan 9, 2025
…ms (#3125) (#3361)

* fix: handle bwc for new fields added in 2.13

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless changes

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases with bwc

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: spotless apply

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
(cherry picked from commit 40c4e68)

Co-authored-by: Pavan Yekbote <[email protected]>
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.

4 participants