Skip to content

Conversation

@opensearch-trigger-bot
Copy link
Contributor

Backport 09af518 from #17396.

Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 09af518)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@peterzhuamazon
Copy link
Member

Close this for now as 2.19 is already free of netty bug and 2.20 is unlikely.

Thanks.

@github-actions github-actions bot deleted the backport/backport-17396-to-2.x branch March 5, 2025 01:38
@github-actions
Copy link
Contributor

github-actions bot commented Mar 5, 2025

❌ Gradle check result for 1a2e8d0: null

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?

@dbwiddis
Copy link
Member

Close this for now as 2.19 is already free of netty bug and 2.20 is unlikely.

Thanks.

@peterzhuamazon Unfortunately since the version bump was in the 2.x section of the change log, this is causing failed backports for all future dependencies which need to be backported.

If we are making a decision to stop backporting (except for bugfix/security) we need to update the dependabot / CI to add to the correct section of the change log. Arbitrarily choosing not to update a dependency is creating a lot of manual effort and churn here.

@peterzhuamazon
Copy link
Member

Got it @dbwiddis so if we re-open this and merge to 2.x, will that resolve the issue for now?

Thanks.

@peterzhuamazon
Copy link
Member

Or is it better to move the changelog entry to unreleased on main instead?

Thanks.

@peterzhuamazon
Copy link
Member

@dbwiddis I have a new backport here:
#17571

Thanks.

@dbwiddis
Copy link
Member

Thanks. 🎉

When that's merged I'll re-trigger the backports for #17560 and #17562 (in that order)

@dbwiddis
Copy link
Member

Or is it better to move the changelog entry to unreleased on main instead?

Honestly I think there's a lot of confusion. We have version bump PRs on 2.x branch for all the plugins for 2.22.0 which people don't seem in a hurry to merge: https://github.com/search?q=org%3Aopensearch-project+increment+2.20.0&type=pullrequests

Personally I'm in favor of keeping the existing routines unless and until it's clearly stated that we aren't doing 2.22.0 and we update all tooling to stop addressing 2.x branch other than intentional bugfix backports. Which I'm not sure we should really do until 3.0.0 is actually released.

Whatever we do we should be intentional about and consistent across the projec.t

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants