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

Add a new configuration setting synonym_analyzer for synonym_graph and synonym. #16488

Merged
merged 5 commits into from
Nov 12, 2024

Conversation

prudhvigodithi
Copy link
Member

@prudhvigodithi prudhvigodithi commented Oct 26, 2024

Description

Coming from #16263 (comment) this PR is not final and still need some discussion.

Related Issues

Part of #16263 and #16530.

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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
Contributor

❌ Gradle check result for fb66d0f: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

❌ Gradle check result for 550756f: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

❌ Gradle check result for 7a5c00e: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Nov 1, 2024

❌ Gradle check result for 17737cf: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Prudhvi Godithi <[email protected]>
Copy link
Contributor

github-actions bot commented Nov 2, 2024

❌ Gradle check result for 0332408: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Nov 3, 2024

✅ Gradle check result for db57995: SUCCESS

Copy link
Contributor

github-actions bot commented Nov 6, 2024

✅ Gradle check result for 84de9dc: SUCCESS

Copy link
Contributor

github-actions bot commented Nov 6, 2024

✅ Gradle check result for 7d6fc43: SUCCESS

Signed-off-by: Prudhvi Godithi <[email protected]>
@prudhvigodithi
Copy link
Member Author

Hey @msfroh I just pushed a commit to fix the CHANGELOG.md conflict, can you please take a look if we are good we can merge this PR.
Thanks

Copy link
Contributor

❌ Gradle check result for 0c33516: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@prudhvigodithi
Copy link
Member Author

prudhvigodithi commented Nov 11, 2024

I have re-triggered the Gradle check, the failure is due to the flaky tests coming from MinimumClusterManagerNodesIT. The existing automation should link this PR to the existing Flaky Test Report for MinimumClusterManagerNodesIT.

Copy link
Contributor

❌ Gradle check result for 0c33516:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for 0c33516: SUCCESS

Signed-off-by: Prudhvi Godithi <[email protected]>
Copy link
Contributor

❌ Gradle check result for 5411897: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for 5411897: SUCCESS

@msfroh msfroh merged commit 5068fad into opensearch-project:main Nov 12, 2024
37 of 38 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-16488-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5068fad53922f992ef651f78c148df6d9170c361
# Push it to GitHub
git push --set-upstream origin backport/backport-16488-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

@prudhvigodithi
Copy link
Member Author

prudhvigodithi commented Nov 12, 2024

Created a backport 2.x PR #16625. I assume the backport failed because of the CommonAnalysisPlugin.java on 2.x and CommonAnalysisModulePlugin.java on main branch.
Thank you
@msfroh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants