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.

Sign up for GitHub

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

Jump to bottom

Bumping 2.x to 2.2.0 #3672

Merged
merged 4 commits into from
Jun 24, 2022
Merged

Bumping 2.x to 2.2.0 #3672

merged 4 commits into from
Jun 24, 2022

Conversation

saratvemulapalli
Copy link
Member

Description

Prepping for 2.1.0 release. Bumping 2.x to 2.2.0.

Please note: 2.1 branch will be cut first before this change will be merged.

Issues Resolved

Part of #3636

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.

@saratvemulapalli
Revert "Remove deprecated methods from JodaCompatibleZonedDateTime wh…
3101bb9 
…ich are called by scripts (#3346) (#3347)"

This reverts commit 3537b5a.

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
@saratvemulapalli
Merge branch 'opensearch-project:2.x' into 2.x
0924e1b
@saratvemulapalli
Bumping 2.x to 2.2
d09c0b9 
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
@saratvemulapalli saratvemulapalli requested review from a team and reta as code owners June 23, 2022 20:47
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure d09c0b9
Log 6264

Reports 6264

@saratvemulapalli
Copy link
Member Author

start gradle check

@saratvemulapalli
Copy link
Member Author

❌   Gradle Check failure d09c0b9 Log 6264

Reports 6264

2.1 branch is now out.

@saratvemulapalli saratvemulapalli mentioned this pull request Jun 23, 2022
Merged
5 tasks
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure d09c0b9
Log 6266

Reports 6266

@kotwanikunal
Copy link
Member 

REPRODUCE WITH: ./gradlew ':server:internalClusterTest' --tests "org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testHighWatermarkNotExceeded" -Dtests.seed=835FA52215765013 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=pl-PL -Dtests.timezone=Asia/Macao -Druntime.java=17

org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT > testHighWatermarkNotExceeded FAILED
    java.lang.AssertionError: Mismatching shard routings: []
    Expected: a collection with size <1>
         but: collection size was <0>
        at __randomizedtesting.SeedInfo.seed([835FA52215765013:6A7E449095B099FD]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:964)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.lambda$assertBusyWithDiskUsageRefresh$5(DiskThresholdDeciderIT.java:362)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1049)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.assertBusyWithDiskUsageRefresh(DiskThresholdDeciderIT.java:355)
        at org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testHighWatermarkNotExceeded(DiskThresholdDeciderIT.java:188)

@kotwanikunal
Copy link
Member

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure d09c0b9
Log 6276

Reports 6276

@kotwanikunal
Copy link
Member 

REPRODUCE WITH: ./gradlew ':qa:verify-version-constants:v2.1.0#integTest' --tests "org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT.testLuceneVersionConstant" -Dtests.seed=B47B98860A3DE5D6 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=fr-LU -Dtests.timezone=Asia/Omsk -Druntime.java=17

org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT > testLuceneVersionConstant FAILED
    java.lang.AssertionError: 
    Expected: <9.2.0>
         but: was <9.3.0>
        at __randomizedtesting.SeedInfo.seed([B47B98860A3DE5D6:391EA5DA2D35269F]: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.qa.verify_version_constants.VerifyVersionConstantsIT.testLuceneVersionConstant(VerifyVersionConstantsIT.java:56)
WARNING: A terminally deprecated method in java.lang.System has been called

@saratvemulapalli The PR needs an update since #3676 was merged in.

@kotwanikunal kotwanikunal mentioned this pull request Jun 23, 2022
Merged
5 tasks
@saratvemulapalli
Updating lucene verion for 2.1
6e6453c 
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
@saratvemulapalli
Copy link
Member Author 

REPRODUCE WITH: ./gradlew ':qa:verify-version-constants:v2.1.0#integTest' --tests "org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT.testLuceneVersionConstant" -Dtests.seed=B47B98860A3DE5D6 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=fr-LU -Dtests.timezone=Asia/Omsk -Druntime.java=17

org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT > testLuceneVersionConstant FAILED
    java.lang.AssertionError: 
    Expected: <9.2.0>
         but: was <9.3.0>
        at __randomizedtesting.SeedInfo.seed([B47B98860A3DE5D6:391EA5DA2D35269F]: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.qa.verify_version_constants.VerifyVersionConstantsIT.testLuceneVersionConstant(VerifyVersionConstantsIT.java:56)
WARNING: A terminally deprecated method in java.lang.System has been called

@saratvemulapalli The PR needs an update since #3676 was merged in.

Thanks @kotwanikunal i've updated it.
Hopefully it should go through.

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 6e6453c
Log 6279

Reports 6279

@saratvemulapalli
Copy link
Member Author

❌   Gradle Check failure 6e6453c Log 6279

Reports 6279

Tests with failures:
 - org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testHighWatermarkNotExceeded

@saratvemulapalli
Copy link
Member Author

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 6e6453c
Log 6282

Reports 6282

@tlfeng
Copy link
Collaborator

tlfeng commented Jun 24, 2022

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 6e6453c
Log 6290

Reports 6290

@saratvemulapalli saratvemulapalli merged commit 718ea66 into opensearch-project:2.x Jun 24, 2022
@saratvemulapalli saratvemulapalli deleted the bump-to-2.2.0 branch June 24, 2022 15:58
@slylock slylock mentioned this pull request May 14, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mch2 mch2 mch2 approved these changes

@reta reta reta approved these changes

Assignees
No one assigned
Labels
v2.2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@saratvemulapalli @opensearch-ci-bot @kotwanikunal @tlfeng @reta @mch2