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

Upgrade to log4j 2.16.0 #1721

Merged
merged 1 commit into from
Dec 14, 2021
Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Dec 14, 2021

Signed-off-by: Andriy Redko [email protected]

Description

Even more hardening has been applied in log4j 2.16.0 (comparing to 2.15.0), see please [1]

[1] https://lists.apache.org/thread/d6v4r6nosxysyq9rvnr779336yf0woz4

Issues Resolved

[List any issues this PR will resolve]

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

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.

@reta reta requested a review from a team as a code owner December 14, 2021 00:32
@reta
Copy link
Collaborator Author

reta commented Dec 14, 2021

@andrross @dblock fyi :-)

@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

Signed-off-by: Andriy Redko <[email protected]>
@reta reta force-pushed the update.log4j.2.16 branch from f43efdc to 892771e Compare December 14, 2021 00:43
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure f43efdccd0a0d5d227602c9158ba1d6f1aa7a157
Log 1477

Reports 1477

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 892771e
Log 1478

Reports 1478

@dblock
Copy link
Member

dblock commented Dec 14, 2021

> Task :server:internalClusterTest

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.routing.PrimaryAllocationIT.testPrimaryReplicaResyncFailed" -Dtests.seed=6D4D4C998D58C02E -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m -Djava.security.manager=allow" -Dtests.locale=es-CR -Dtests.timezone=Africa/Johannesburg -Druntime.java=17

org.opensearch.cluster.routing.PrimaryAllocationIT > testPrimaryReplicaResyncFailed FAILED
    java.lang.AssertionError: 
    Expected: a collection with size <4>
         but: collection size was <3>
        at __randomizedtesting.SeedInfo.seed([6D4D4C998D58C02E:A2886BE2A57855BE]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:956)
        at org.junit.Assert.assertThat(Assert.java:923)
        at org.opensearch.cluster.routing.PrimaryAllocationIT.lambda$testPrimaryReplicaResyncFailed$14(PrimaryAllocationIT.java:727)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1048)
        at org.opensearch.cluster.routing.PrimaryAllocationIT.testPrimaryReplicaResyncFailed(PrimaryAllocationIT.java:724)

#1722

@dblock
Copy link
Member

dblock commented Dec 14, 2021

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 892771e
Log 1480

Reports 1480

@dblock dblock added backport 1.x pending backport Identifies an issue or PR that still needs to be backported labels Dec 14, 2021
@dblock dblock merged commit 6db4354 into opensearch-project:main Dec 14, 2021
@dblock
Copy link
Member

dblock commented Dec 14, 2021

Backport to 1.x pls.

reta added a commit to reta/OpenSearch that referenced this pull request Dec 14, 2021
dblock pushed a commit that referenced this pull request Dec 14, 2021
@dblock dblock removed the pending backport Identifies an issue or PR that still needs to be backported label Dec 14, 2021
dblock pushed a commit to dblock/OpenSearch that referenced this pull request Dec 14, 2021
dblock added a commit that referenced this pull request Dec 15, 2021
* Increment version to 1.2.2.

Signed-off-by: dblock <[email protected]>

* Upgrade to log4j 2.16.0 (#1721) (#1723)

Signed-off-by: Andriy Redko <[email protected]>

* Moving DCO to workflows (#1458)

Signed-off-by: CEHENKLE <[email protected]>

Co-authored-by: Andriy Redko <[email protected]>
Co-authored-by: CEHENKLE <[email protected]>
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.

5 participants