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

Revert renaming masterOperation() to clusterManagerOperation() #3681

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Revert renaming masterOperation() to clusterManagerOperation() #3681

merged 1 commit into from
Jun 27, 2022

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Jun 23, 2022 •
edited
Loading

Description

Restore all the abstract methods that deprecated and renamed in PR #3617 to its original appearance.
(The original files are: https://github.com/opensearch-project/OpenSearch/tree/2.0.1/server/src/main/java/org/opensearch/action/support/master).

  • Revert deprecating abstract method masterOperation() of class TransportClusterManagerNodeReadAction
  • Revert deprecating abstract method doMasterOperation() of class TransportClusterInfoAction
  • Remove the alternative methods clusterManagerOperation() and doClusterManagerOperation()

Issues Resolved

#3683

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.

Revert renaming masterOperation() to clusterManagerOperation()
472f9d7 
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng added bug Something isn't working backwards-compatibility backport 2.x Backport to 2.x branch backport 2.1 v2.1.0 Issues and PRs related to version 2.1.0 labels Jun 23, 2022
@tlfeng tlfeng mentioned this pull request Jun 23, 2022
Merged
5 tasks
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 472f9d7
Log 6274

Reports 6274

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jun 23, 2022

In log 6274:

REPRODUCE WITH: ./gradlew ':server:test' --tests "org.opensearch.index.store.StoreTests.testcleanupAndPreserveLatestCommitPoint" -Dtests.seed=821430C72CDC406C -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=sr-ME -Dtests.timezone=Asia/Vladivostok -Druntime.java=17

org.opensearch.index.store.StoreTests > testcleanupAndPreserveLatestCommitPoint FAILED
    java.lang.AssertionError
        at __randomizedtesting.SeedInfo.seed([821430C72CDC406C:86519D66A9EA828F]:0)
        at org.opensearch.index.store.StoreTests.testcleanupAndPreserveLatestCommitPoint(StoreTests.java:1185)

It is reproducible locally in main branch.

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jun 24, 2022

start gradle check

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jun 24, 2022

This PR has been backported to 2.1 branch in PR #3682 / commit 6c9a6a4

@tlfeng tlfeng marked this pull request as ready for review June 24, 2022 05:34
@tlfeng tlfeng requested review from a team and reta as code owners June 24, 2022 05:34
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 472f9d7
Log 6288

Reports 6288

@tlfeng tlfeng added v3.0.0 Issues and PRs related to version 3.0.0 v2.2.0 and removed v2.1.0 Issues and PRs related to version 2.1.0 labels Jun 24, 2022
dreamer-89
dreamer-89 approved these changes Jun 25, 2022
View reviewed changes
Copy link
Member

@dreamer-89 dreamer-89 left a comment

Choose a reason for hiding this comment

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

LGTM!

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jun 26, 2022

@dreamer-89 Thank you for your review! 👍

@tlfeng
Copy link
Collaborator Author

tlfeng commented Jun 27, 2022

@nknize Thanks for your review! 👏

@tlfeng tlfeng merged commit f8aa20a into opensearch-project:main Jun 27, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 27, 2022
@github-actions
Revert renaming masterOperation() to clusterManagerOperation() (#3681)
65901a8 
Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit f8aa20a)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jun 27, 2022
Merged
@tlfeng tlfeng mentioned this pull request Jun 27, 2022
Closed
tlfeng pushed a commit that referenced this pull request Jun 27, 2022
@opensearch-trigger-bot
Revert renaming masterOperation() to clusterManagerOperation() (#3681) (
26c0b6f 
#3714)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit f8aa20a)
saratvemulapalli pushed a commit that referenced this pull request Jun 27, 2022
@saratvemulapalli
Revert renaming masterOperation() to clusterManagerOperation() (#3681)
f34aeaf 
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng deleted the restore-masteroperation branch June 27, 2022 23:02
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jul 3, 2022
@imRishN
Revert renaming masterOperation() to clusterManagerOperation() (opens…
f6a2445 
…earch-project#3681)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dreamer-89 dreamer-89 dreamer-89 approved these changes

@nknize nknize nknize approved these changes

@reta reta Awaiting requested review from reta reta is a code owner

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch backwards-compatibility bug Something isn't working v2.2.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tlfeng @opensearch-ci-bot @nknize @dreamer-89