Skip to content

[Backport 2.1] Revert to Netty 4.1.79.Final#4439

Merged
reta merged 2 commits intoopensearch-project:2.1from
cwperks:backport/backport-4428-to-2.1
Sep 7, 2022
Merged

[Backport 2.1] Revert to Netty 4.1.79.Final#4439
reta merged 2 commits intoopensearch-project:2.1from
cwperks:backport/backport-4428-to-2.1

Conversation

@cwperks
Copy link
Copy Markdown
Member

@cwperks cwperks commented Sep 7, 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.

@cwperks
Revert to Netty 4.1.79.Final (opensearch-project#4428)
0546bff 
Signed-off-by: Craig Perkins <cwperx@amazon.com>

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fb64a85)
@cwperks
Remove netty-codec-http2-4.1.79.Final.jar.sha1
9ffd2b5 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks requested review from a team and reta as code owners September 7, 2022 14:02
@cwperks cwperks mentioned this pull request Sep 7, 2022
Merged
6 tasks
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 7, 2022

Gradle Check (Jenkins) Run Completed with:

@dreamer-89
Copy link
Copy Markdown
Member

dreamer-89 commented Sep 7, 2022

The build was successful and script completed successfully. @peterzhuamazon : Any idea why build is marked failed ?

BUILD SUCCESSFUL in 21m 52s
2581 actionable tasks: 2567 executed, 2 from cache, 12 up-to-date
[Pipeline] }
[Pipeline] // withCredentials
[Pipeline] }
[Pipeline] // script
Post stage
[Pipeline] sh
+ find search/build/reports/jacoco/ -name *.xml
+ head -n 1
+ cp -v search/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml codeCoverage.xml
'search/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml' -> 'codeCoverage.xml'
[Pipeline] junit
Recording test results
[Checks API] No suitable checks publisher found.
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] script
[Pipeline] {
[Pipeline] sh
+ rm -rf ADMINS.md CODE_OF_CONDUCT.md CONTRIBUTING.md DEVELOPER_GUIDE.md LICENSE.txt MAINTAINERS.md NOTICE ONBOARDING.md Pipfile Pipfile.lock README.md assemble.sh build.gradle build.sh checkout.sh ci.sh codeCoverage.xml config deployment docker gradle gradle.properties gradlew gradlew.bat jenkins legacy-manifests lib manifests manifests.sh meta publish pyproject.toml pytest.ini release-notes release_notes.sh run.sh scripts search settings.gradle sign.sh src test.sh tests tools vars whitesource.config zenhub_tab_image.png
[Pipeline] cleanWs
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Deferred wipeout is disabled by the job configuration...
[WS-CLEANUP] done
[Pipeline] }
[Pipeline] // script
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Declarative: Post Actions)
[Pipeline] script
[Pipeline] {
[Pipeline] cleanWs
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Deferred wipeout is disabled by the job configuration...
[WS-CLEANUP] done
[Pipeline] }
[Pipeline] // script
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // timeout
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
[Checks API] No suitable checks publisher found.
Finished: SUCCESS

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 7, 2022

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit 2a46993 into opensearch-project:2.1 Sep 7, 2022
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 2, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.51%. Comparing base (0b80ecb) to head (9ffd2b5).
⚠️ Report is 9 commits behind head on 2.1.

Additional details and impacted files 
@@             Coverage Diff              @@
##                2.1    #4439      +/-   ##
============================================
- Coverage     70.61%   70.51%   -0.11%     
+ Complexity    56383    56334      -49     
============================================
  Files          4515     4515              
  Lines        271423   271423              
  Branches      39958    39958              
============================================
- Hits         191669   191390     -279     
- Misses        63627    63906     +279     
  Partials      16127    16127

☔ 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.

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

Reviewers

@reta reta reta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cwperks @dreamer-89 @reta