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/backport 15194 to 2.x #15287

Conversation

finnegancarroll
Copy link
Contributor

Description

Backport #15194

Related Issues

Resolves #15169

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 490d442: 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 ad03d17: 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?

@dblock
Copy link
Member

dblock commented Aug 19, 2024

@finnegancarroll rebase?

@jainankitk
Copy link
Collaborator

@finnegancarroll - Can you resolve the conflicts by merging from main?

Signed-off-by: Finn Carroll <carrofin@amazon.com>
@finnegancarroll finnegancarroll force-pushed the backport/backport-15194-to-2.x branch from ad03d17 to b21d00f Compare August 20, 2024 00:49
Copy link
Contributor

❌ Gradle check result for b21d00f: 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 e51c1d4: 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: Finn Carroll <carrofin@amazon.com>
@finnegancarroll finnegancarroll force-pushed the backport/backport-15194-to-2.x branch from e51c1d4 to 23201db Compare August 20, 2024 05:17
Copy link
Contributor

❌ Gradle check result for 23201db: 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?

@finnegancarroll
Copy link
Contributor Author

MasterServiceTests.testClusterStateUpdateLoggingWithDebugEnabled is flaky.
#15117

Copy link
Contributor

✅ Gradle check result for 23201db: SUCCESS

Copy link

codecov bot commented Aug 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.61%. Comparing base (d1adaf3) to head (23201db).
Report is 6 commits behind head on 2.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #15287      +/-   ##
============================================
- Coverage     71.62%   71.61%   -0.02%     
+ Complexity    63002    62974      -28     
============================================
  Files          5157     5157              
  Lines        295230   295230              
  Branches      42971    42970       -1     
============================================
- Hits         211466   211431      -35     
- Misses        66073    66109      +36     
+ Partials      17691    17690       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@finnegancarroll
Copy link
Contributor Author

@dblock @jainankitk

@jainankitk
Copy link
Collaborator

Had to re-approve after the PR was closed/opened. The maintainer approval check was stuck. Not sure if this is issue with the workflow. cc: @mch2 @dblock

@jainankitk jainankitk merged commit 69fa4d0 into opensearch-project:2.x Aug 21, 2024
64 of 67 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

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

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
pushd ../.worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-15287-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 69fa4d0d4b3662d32c7117e6953ab60f83799d56
# Push it to GitHub
git push --set-upstream origin backport/backport-15287-to-2.16
# Go back to the original working tree
popd
# 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-15287-to-2.16.

@jainankitk
Copy link
Collaborator

Backport to 2.16 is not needed since the filter rewrite optimization can be disabled using cluster setting. Removed the label!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants