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 2.x] Revert to Netty 4.1.79.Final #4432

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 6, 2022

Signed-off-by: Craig Perkins cwperx@amazon.com

Description

See related issue: #4427

The last minor version of Netty included a change to eagerly load certificates using BouncyCastle if BouncyCastle is on the classpath: netty/netty#12670

This change has led to errors on startup with the security plugin (See #4427) because of a bug in checking all required BouncyCastle dependencies (See netty/netty#12743)

There is another bug related to the change that impacts custom bundles for private keys (netty/netty#12746). Both bugs have since been fixed and are targeted for the next 4.1.X release of netty.

This PR reverts netty until the next 4.1.X (4.1.81.Final) release. The full list of changes in netty 4.1.80.Final can be found here

Issues Resolved

#4427

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

Signed-off-by: Craig Perkins <cwperx@amazon.com>

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fb64a85)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks requested review from a team and reta as code owners September 6, 2022 23:40
@cliu123
Copy link
Member

cliu123 commented Sep 6, 2022

@dreamer-89 Precommit failed due to > Task :modules:transport-netty4:dependencyLicenses FAILED. Does this need to be resolved before merging? Would you please help with this? Thanks!

@github-actions
Copy link
Contributor

github-actions bot commented Sep 6, 2022

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Sep 6, 2022

@cliu123 That file was added in this PR (#3847) which is in main and not in 2.x. I believe the license file can be removed safely. I did not remove it initially when creating the manual backport.

@cwperks cwperks mentioned this pull request Sep 6, 2022
6 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2022

Gradle Check (Jenkins) Run Completed with:

@dreamer-89
Copy link
Member

dreamer-89 commented Sep 7, 2022

Flaky test failure. Tracked in #4162 . Refiring!

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testRestoreSnapshotAllocationDoesNotExceedWatermark" -Dtests.seed=11BDC26C6A36BD41 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=tr -Dtests.timezone=Etc/GMT-6 -Druntime.java=17

org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT > testRestoreSnapshotAllocationDoesNotExceedWatermark FAILED
    java.lang.AssertionError: 
    Expected: an empty collection
         but: <[[hwlddrmihf][2], node[JkVtuaGDRaCplowzx7P-Ag], [P], s[STARTED], a[id=B5wyH7XqQ6GdEMupdA3sXg], [hwlddrmihf][0], node[JkVtuaGDRaCplowzx7P-Ag], [P], s[STARTED], a[id=Tg9IHB4BQJOF_TU1QK4_Xg]]>
        at __randomizedtesting.SeedInfo.seed([11BDC26C6A36BD41:305640D018FA2F9]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:964)
        at org.junit.Assert.assertThat(Assert.java:930)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.lambda$testRestoreSnapshotAllocationDoesNotExceedWatermark$2(DiskThresholdDeciderIT.java:260)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1049)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1022)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testRestoreSnapshotAllocationDoesNotExceedWatermark(DiskThresholdDeciderIT.java:260)


@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2022

Gradle Check (Jenkins) Run Completed with:

@dreamer-89 dreamer-89 merged commit 32258cf into opensearch-project:2.x Sep 7, 2022
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