natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix skipped tests and flakiness in CassandraRoleManagerTest 

Adds missing @Test annotations to testPasswordUpdateRateLimiting and testPasswordUpdateRateLimitingDisabled.
Also fixes minor typos in comments and assertion strings.
Fix flaky CassandraRoleManagerTest by grouping per-role rate limit checks consecutively.

patch by Arvind Kandpal; reviewed by Stefan Miklosovic, Michael Semb Wever for CASSANDRA-21262
This commit is contained in:
Arvind Kandpal 2026-06-03 16:31:53 +05:30 committed by Stefan Miklosovic
parent 0f9f6dd6e5
commit c2901c71eb
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/unit/org/apache/cassandra/auth/CassandraRoleManagerTest.java
View File

@ -52,7 +52,7 @@ public class CassandraRoleManagerTest
public void getGrantedRolesImplMinimizesReads()
{
// IRoleManager::getRoleDetails was not in the initial API, so a default impl
// was added which uses the existing methods on IRoleManager as primitive to
// was added which uses the existing methods on IRoleManager as primitives to
// construct the Role objects. While this will work for any IRoleManager impl
// it is inefficient, so CassandraRoleManager has its own implementation which
// collects all of the necessary info with a single query for each granted role.
@ -75,7 +75,7 @@ public class CassandraRoleManagerTest
fetchRolesAndCheckReadCount(roleManager, ROLE_A);
// Check that when granted roles appear multiple times in parallel levels of the hierarchy, we don't
// do redundant reads. E.g. here role_b_1, role_b_2 and role_b3 are granted to both role_b and role_c
// do redundant reads. E.g. here role_b_1, role_b_2 and role_b_3 are granted to both role_b and role_c
// but we only want to actually read them once
grantRolesTo(roleManager, ROLE_C, ROLE_B_1, ROLE_B_2, ROLE_B_3);
fetchRolesAndCheckReadCount(roleManager, ROLE_A);
@ -182,15 +182,12 @@ public class CassandraRoleManagerTest
RoleOptions options2 = getLoginRoleOptions("password2");
roleManager.createRole(AuthenticatedUser.ANONYMOUS_USER, role2, options2);
// Wait for the rate limit interval to pass
// Wait for the rate limit interval to pass since creation
Thread.sleep(150);
RoleOptions newOptions1 = getLoginRoleOptions("new_password1");
roleManager.alterRole(AuthenticatedUser.ANONYMOUS_USER, role1, newOptions1);
RoleOptions newOptions2 = getLoginRoleOptions("new_password2");
roleManager.alterRole(AuthenticatedUser.ANONYMOUS_USER, role2, newOptions2);
try
{
RoleOptions newOptions1Again = getLoginRoleOptions("another_password1");
@ -202,6 +199,20 @@ public class CassandraRoleManagerTest
assertEquals("Password for role test_role_1 can only be changed every 100ms.", e.getMessage());
}
RoleOptions newOptions2 = getLoginRoleOptions("new_password2");
roleManager.alterRole(AuthenticatedUser.ANONYMOUS_USER, role2, newOptions2);
try
{
RoleOptions newOptions2Again = getLoginRoleOptions("another_password2");
roleManager.alterRole(AuthenticatedUser.ANONYMOUS_USER, role2, newOptions2Again);
fail("Expected OverloadedException for test_role_2");
}
catch (OverloadedException e)
{
assertEquals("Password for role test_role_2 can only be changed every 100ms.", e.getMessage());
}
roleManager.dropRole(AuthenticatedUser.ANONYMOUS_USER, role1);
roleManager.dropRole(AuthenticatedUser.ANONYMOUS_USER, role2);
}