-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Backport/backport 15194 to 2.x #15287
Conversation
❌ 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? |
❌ 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? |
@finnegancarroll rebase? |
@finnegancarroll - Can you resolve the conflicts by merging from main? |
Signed-off-by: Finn Carroll <carrofin@amazon.com>
ad03d17
to
b21d00f
Compare
❌ 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? |
❌ 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>
e51c1d4
to
23201db
Compare
❌ 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? |
MasterServiceTests.testClusterStateUpdateLoggingWithDebugEnabled is flaky. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
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. |
The backport to
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 |
Backport to 2.16 is not needed since the filter rewrite optimization can be disabled using cluster setting. Removed the label! |
Description
Backport #15194
Related Issues
Resolves #15169
Check List
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.