Skip to content

Revert "Adding integration of derived source feature across diff paths" #18542

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

Merged
merged 2 commits into from
Jun 17, 2025

Conversation

andrross
Copy link
Member

This reverts 674de10 (#18493) and 190ea02 (#18054) due to failing tests. See #14509 for details.

Check List

  • Functionality includes testing.

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.

@andrross andrross changed the title Revert "Adding integration of derived source feature across diff paths Revert "Adding integration of derived source feature across diff paths" Jun 17, 2025
@andrross
Copy link
Member Author

FYI @tanik98 @msfroh @rishabhmaurya

Copy link
Contributor

✅ Gradle check result for 120bb01: SUCCESS

Copy link

codecov bot commented Jun 17, 2025

Codecov Report

Attention: Patch coverage is 77.77778% with 2 lines in your changes missing coverage. Please review.

Project coverage is 72.74%. Comparing base (a4dba6e) to head (120bb01).
Report is 6 commits behind head on main.

Files with missing lines Patch % Lines
...rg/opensearch/index/engine/TranslogLeafReader.java 50.00% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #18542      +/-   ##
============================================
- Coverage     72.77%   72.74%   -0.03%     
+ Complexity    68170    68062     -108     
============================================
  Files          5540     5537       -3     
  Lines        313384   313232     -152     
  Branches      45473    45458      -15     
============================================
- Hits         228051   227848     -203     
- Misses        66811    66834      +23     
- Partials      18522    18550      +28     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@msfroh msfroh merged commit a7f28f6 into opensearch-project:main Jun 17, 2025
35 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@andrross
Copy link
Member Author

Created backport here: #18543

Commit 674de10 was not backported to 3.1, so the cherry-pick failed. I created the backport by just reverting the one commit from 3.1.

@andrross andrross deleted the revert-18054 branch June 17, 2025 21:05
neuenfeldttj pushed a commit to neuenfeldttj/OpenSearch that referenced this pull request Jun 26, 2025
neuenfeldttj pushed a commit to neuenfeldttj/OpenSearch that referenced this pull request Jun 26, 2025
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.

2 participants