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

Add a new node role 'cluster_manager' as the alternative for 'master' role and deprecate 'master' role #2424

Merged
merged 57 commits into from
Mar 18, 2022
Merged

Add a new node role 'cluster_manager' as the alternative for 'master' role and deprecate 'master' role #2424

merged 57 commits into from
Mar 18, 2022

Commits on Mar 9, 2022

  1. Add a new role cluster_manager as alternative to existing master role 

    Signed-off-by: Tianli Feng <ftl94@live.com>
    @tlfeng
    tlfeng committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    344998c View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Add CLUSTER_MANAGER_ROLE in server code and replace MASTER_ROLE in tests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    0396a4a View commit details
    Browse the repository at this point in the history

  2. adjust format by spotlessApply 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    77520c8 View commit details
    Browse the repository at this point in the history

  3. add hack in setAdditionalRoles() to allow CLUSTER_MANAGER_ROLE having… 

    … same abbr name with MASTER_ROLE

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    085f07f View commit details
    Browse the repository at this point in the history

  4. adjust format by spotlessApply 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    d9aec73 View commit details
    Browse the repository at this point in the history

  5. Fix DiscoveryNodeRoleSettingTests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    02f8f86 View commit details
    Browse the repository at this point in the history

  6. Change todo expression 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    573380f View commit details
    Browse the repository at this point in the history

  7. adjust format by spotlessApply 

    Signed-off-by: Tianli Feng <ftl94@live.com>
    @tlfeng
    tlfeng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    bd395af View commit details
    Browse the repository at this point in the history

  8. remove MASTER_ROLE from built-in roles 

    Signed-off-by: Tianli Feng <ftl94@live.com>
    @tlfeng
    tlfeng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    83460f4 View commit details
    Browse the repository at this point in the history

  9. fix unit tests 

    Signed-off-by: Tianli Feng <ftl94@live.com>
    @tlfeng
    tlfeng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    0940b41 View commit details
    Browse the repository at this point in the history

  10. Fix unit tests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    41806f0 View commit details
    Browse the repository at this point in the history

  11. Adjust format 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    11c4ff5 View commit details
    Browse the repository at this point in the history

  12. Remove temprorary log message 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    8cc54e3 View commit details
    Browse the repository at this point in the history

  13. Remove temprorary log message 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f06766e View commit details
    Browse the repository at this point in the history

  14. Remove duplicate m in node.role of cat nodes API 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    70c8f4a View commit details
    Browse the repository at this point in the history

  15. Add yaml rest test for node role cluster_manager 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    e8e2e30 View commit details
    Browse the repository at this point in the history

  16. Allow _cluster_manager as a value of node filter 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    46098cd View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. Add compatitabilityRole to cluster_manager role 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    73b4652 View commit details
    Browse the repository at this point in the history

  2. Revert adding isClusterManagerEligible() 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d1acef0 View commit details
    Browse the repository at this point in the history

  3. Remove master role from the default value of node.roles 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    812aa39 View commit details
    Browse the repository at this point in the history

  4. Revert a mistake of removing javadoc comment 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    d15e44f View commit details
    Browse the repository at this point in the history

  5. Add a comment of setting a default value of a temp setting to false 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    0189e86 View commit details
    Browse the repository at this point in the history

  6. Fix cluster stats nodes count 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    14ef7c5 View commit details
    Browse the repository at this point in the history

  7. Fix DiscoveryNodeRoleSettingTests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    06fdf74 View commit details
    Browse the repository at this point in the history

  8. adjust format 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    10247a2 View commit details
    Browse the repository at this point in the history

  9. Reduce code change 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    8817b73 View commit details
    Browse the repository at this point in the history

  10. Skip run node_info role test during during mixedClusterTest, after a … 

    …node got upgraded

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    010fd29 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Skip run node_info role test during during mixedClusterTest, after a … 

    …node got upgraded

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    eda18db View commit details
    Browse the repository at this point in the history

  2. Add unit tests in DiscoveryNodeTests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    8f9ab2b View commit details
    Browse the repository at this point in the history

  3. Revert adding clustermanager role into isDedicatedVotingOnlyNode 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    22567a4 View commit details
    Browse the repository at this point in the history

  4. Modify the test to assign master and clusetr_manager role in Internal… 

    …TestClusterTests

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    4e0b27c View commit details
    Browse the repository at this point in the history

  5. modify the comment 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    6d08a78 View commit details
    Browse the repository at this point in the history

  6. Add cluster_manager role to be tested by node selector in 2 uni tests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    8ca3a9f View commit details
    Browse the repository at this point in the history

  7. Revert import util.* 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    4c0e5f4 View commit details
    Browse the repository at this point in the history

  8. Fix newly added test in DiscoveryNodeTests 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    4fa904f View commit details
    Browse the repository at this point in the history

  9. Fix nodes.info yaml rest test during mixedclustertest 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    d1ee0c6 View commit details
    Browse the repository at this point in the history

  10. Reduce code change in removeRoles() 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    a4b7b72 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into node-role-cluster-manager 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    dafc3b7 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Merge branch 'main' into node-role-cluster-manager 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    4fd23e6 View commit details
    Browse the repository at this point in the history

  2. Change == to equals() 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    7a2a6b9 View commit details
    Browse the repository at this point in the history

  3. Change Version.Current to Version.v2_0_0, since current is a moving t… 

    …arget

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    83a3c73 View commit details
    Browse the repository at this point in the history

  4. Remove an unnecessary TODO 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    e4404d7 View commit details
    Browse the repository at this point in the history

  5. Change MASTER_ROLE to CLUSTER_MANAGER_ROLE directly in a method about… 

    … voting_only node

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    b5837b7 View commit details
    Browse the repository at this point in the history

  6. Fix yaml rest test by adding proper node selector 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    ebb1c45 View commit details
    Browse the repository at this point in the history

  7. Add validateRole() to aviod cluster_manager and master role exist tog… 

    …ether

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    0dadd68 View commit details
    Browse the repository at this point in the history

  8. Remove an unnecessary TODO 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    6845cdd View commit details
    Browse the repository at this point in the history

  9. Remove validateRole() in MASTER_ROLE 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    f818ea1 View commit details
    Browse the repository at this point in the history

  10. Add unit test for the role setting validator 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    5847ae0 View commit details
    Browse the repository at this point in the history

  11. Modify error message for both roles assigned 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    14124bd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into node-role-cluster-manager 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    ef70fe9 View commit details
    Browse the repository at this point in the history

  13. Reduce || for comparing with cluster_manager and master role by warpp… 

    …ing in methods

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    a2661a8 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into node-role-cluster-manager

    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    47961ce View commit details
    Browse the repository at this point in the history

  15. Add deprecation message for setting master role 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    f59a27b View commit details
    Browse the repository at this point in the history

  16. Modify the deprecation message for master role 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    90f143a View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merge branch 'main' into node-role-cluster-manager 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    69c3795 View commit details
    Browse the repository at this point in the history

  2. Revert code about abbr name in RestNodesAction 

    Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    87e5048 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into node-role-cluster-m… 

    …anager

Signed-off-by: Tianli Feng <ftianli@amazon.com>
    Tianli Feng committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    f57741d View commit details
    Browse the repository at this point in the history