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

Remove LegacyESVersion.V_6_1_x constants #1681

Merged
merged 3 commits into from
Dec 9, 2021
Merged

Remove LegacyESVersion.V_6_1_x constants #1681

merged 3 commits into from
Dec 9, 2021

Conversation

nknize
Copy link
Collaborator

@nknize nknize commented Dec 8, 2021 •
edited
Loading

This PR removes LegacyESVersion.V_6_1_x constants including all
pre-release versions and bug fixes.

closes #1679

@nknize
Remove 6.1.x version constants
ea3d228 
This commit removes LegacyESVersion.V_6_1_x constants including all
pre-release versions and bug fixes.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
@nknize nknize added v2.0.0 Version 2.0.0 non-issue bugs / unexpected behaviors that end up non issues; audit trail simple changes that aren't issues labels Dec 8, 2021
@nknize nknize requested a review from a team as a code owner December 8, 2021 22:19
@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@nknize nknize changed the title Remove 6.1.x version constants Remove LegacyESVersion.6.1.x constants Dec 8, 2021
@nknize nknize changed the title Remove LegacyESVersion.6.1.x constants Remove LegacyESVersion.V_6_1_x constants Dec 8, 2021
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure ea3d228
Log 1391

Reports 1391

@nknize
fix test failure
ba6c810 
Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure ba6c810
Log 1392

Reports 1392

adnapibar
adnapibar approved these changes Dec 8, 2021
View reviewed changes
Copy link
Contributor

@adnapibar adnapibar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - couple of nits

modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java Outdated Show resolved Hide resolved
server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java Outdated Show resolved Hide resolved
@nknize
fix failing tests and incorporate PR feedback
940cb6e 
Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 940cb6e
Log 1393

Reports 1393

@nknize
Copy link
Collaborator Author

nknize commented Dec 8, 2021

Unrelated failure (I could not reproduce this locally). This occurred twice:

./gradlew ':server:test' --tests "org.opensearch.cluster.routing.allocation.decider.ConcurrentRecoveriesAllocationDeciderTests.testClusterConcurrentRecoveries" -Dtests.seed=1E6DBFB47C410A54 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ar-SY -Dtests.timezone=Asia/Ust-Nera -Druntime.java=17

org.opensearch.cluster.routing.allocation.decider.ConcurrentRecoveriesAllocationDeciderTests > testClusterConcurrentRecoveries FAILED
    java.lang.AssertionError: 
    Expected: <40>
         but: was <36>
        at __randomizedtesting.SeedInfo.seed([1E6DBFB47C410A54:C483ECD37CB36683]: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.allocation.decider.ConcurrentRecoveriesAllocationDeciderTests.testClusterConcurrentRecoveries(ConcurrentRecoveriesAllocationDeciderTests.java:221)

/cc @jainankitk

@nknize
Copy link
Collaborator Author

nknize commented Dec 8, 2021

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 940cb6e
Log 1394

Reports 1394

@nknize
Copy link
Collaborator Author

nknize commented Dec 9, 2021 •
edited
Loading

HAProxy issue (also could not reproduce locally):

./gradlew ':qa:remote-clusters:integTest' --tests "org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks" -Dtests.seed=4C426D008FCAC0C0 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=hu -Dtests.timezone=America/Louisville -Druntime.java=17

  2> java.lang.AssertionError
        at __randomizedtesting.SeedInfo.seed([4C426D008FCAC0C0:4B34B8CBB44CB69D]:0)
        at org.junit.Assert.fail(Assert.java:86)
        at org.junit.Assert.assertTrue(Assert.java:41)
        at org.junit.Assert.assertTrue(Assert.java:52)
        at org.opensearch.cluster.remote.test.RemoteClustersIT.testHAProxyModeConnectionWorks(RemoteClustersIT.java:125)
  2> NOTE: leaving temporary files on disk at: /var/CITOOL/workflow/OpenSearch_CI/PR_Checks/Gradle_Check/search/qa/remote-clusters/build/testrun/integTest/temp/org.opensearch.cluster.remote.test.RemoteClustersIT_4C426D008FCAC0C0-001
  2> NOTE: test params are: codec=Asserting(Lucene87): {}, docValues:{}, maxPointsInLeafNode=878, maxMBSortInHeap=5.294271434390409, sim=Asserting(RandomSimilarity(queryNorm=false): {}), locale=hu, timezone=America/Louisville
  2> NOTE: Linux 5.4.0-1045-aws amd64/Eclipse Adoptium 17.0.1 (64-bit)/cpus=72,threads=1,free=436388792,total=536870912
  2> NOTE: All tests run in this JVM: [RemoteClustersIT]

@nknize
Copy link
Collaborator Author

nknize commented Dec 9, 2021

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 940cb6e
Log 1398

Reports 1398

@nknize nknize merged commit 821417b into opensearch-project:main Dec 9, 2021
@nknize nknize mentioned this pull request Dec 9, 2021
Closed
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adnapibar adnapibar adnapibar approved these changes

Assignees
No one assigned
Labels
non-issue bugs / unexpected behaviors that end up non issues; audit trail simple changes that aren't issues v2.0.0 Version 2.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove LegacyESVersion.V_6_1_x constants
3 participants
@nknize @opensearch-ci-bot @adnapibar