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

Fix flakiness of AuditLoggerAuthTest and CQLUserAuditTest by awaiting of default superuser role creation 

patch by Dmitry Konstantinov; reviewed by Michael Semb Wever for CASSANDRA-19165
This commit is contained in:
Dmitry Konstantinov 2026-02-01 12:06:05 +00:00
parent 350c83dc15
commit 1f220921dc
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java
View File

@ -36,6 +36,7 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.apache.cassandra.ServerTestUtils; import org.apache.cassandra.ServerTestUtils;
import org.apache.cassandra.auth.AuthTestUtils;
import org.apache.cassandra.auth.CassandraAuthorizer; import org.apache.cassandra.auth.CassandraAuthorizer;
import org.apache.cassandra.auth.CassandraRoleManager; import org.apache.cassandra.auth.CassandraRoleManager;
import org.apache.cassandra.auth.PasswordAuthenticator; import org.apache.cassandra.auth.PasswordAuthenticator;
@ -82,6 +83,7 @@ public class AuditLoggerAuthTest
SUPERUSER_SETUP_DELAY_MS.setLong(0); SUPERUSER_SETUP_DELAY_MS.setLong(0);
embedded = ServerTestUtils.startEmbeddedCassandraService(); embedded = ServerTestUtils.startEmbeddedCassandraService();
AuthTestUtils.waitForExistingRoles();
executeWithCredentials( executeWithCredentials(
Arrays.asList(getCreateRoleCql(TEST_USER, true, false, false), Arrays.asList(getCreateRoleCql(TEST_USER, true, false, false),
@ -368,6 +370,8 @@ public class AuditLoggerAuthTest
} }
catch (AuthenticationException e) catch (AuthenticationException e)
{ {
if (expectedType == null)
throw e;
authFailed = true; authFailed = true;
} }
catch (UnauthorizedException ue) catch (UnauthorizedException ue)

26
test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java
View File

@ -44,6 +44,7 @@ import org.apache.cassandra.audit.AuditEvent;
import org.apache.cassandra.audit.AuditLogEntryType; import org.apache.cassandra.audit.AuditLogEntryType;
import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.audit.AuditLogManager;
import org.apache.cassandra.audit.DiagnosticEventAuditLogger; import org.apache.cassandra.audit.DiagnosticEventAuditLogger;
import org.apache.cassandra.auth.AuthTestUtils;
import org.apache.cassandra.auth.CassandraRoleManager; import org.apache.cassandra.auth.CassandraRoleManager;
import org.apache.cassandra.auth.PasswordAuthenticator; import org.apache.cassandra.auth.PasswordAuthenticator;
import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.DatabaseDescriptor;
@ -78,6 +79,8 @@ public class CQLUserAuditTest
SUPERUSER_SETUP_DELAY_MS.setLong(0); SUPERUSER_SETUP_DELAY_MS.setLong(0);
embedded = ServerTestUtils.startEmbeddedCassandraService(); embedded = ServerTestUtils.startEmbeddedCassandraService();
AuthTestUtils.waitForExistingRoles();
executeAs(Arrays.asList("CREATE ROLE testuser WITH LOGIN = true AND SUPERUSER = false AND PASSWORD = 'foo'", executeAs(Arrays.asList("CREATE ROLE testuser WITH LOGIN = true AND SUPERUSER = false AND PASSWORD = 'foo'",
"CREATE ROLE testuser_nologin WITH LOGIN = false AND SUPERUSER = false AND PASSWORD = 'foo'", "CREATE ROLE testuser_nologin WITH LOGIN = false AND SUPERUSER = false AND PASSWORD = 'foo'",
@ -214,20 +217,23 @@ public class CQLUserAuditTest
AuditLogEntryType expectedAuthType) throws Exception AuditLogEntryType expectedAuthType) throws Exception
{ {
boolean authFailed = false; boolean authFailed = false;
Cluster cluster = Cluster.builder().addContactPoints(InetAddress.getLoopbackAddress()) try(Cluster cluster = Cluster.builder().addContactPoints(InetAddress.getLoopbackAddress())
.withoutJMXReporting() .withoutJMXReporting()
.withCredentials(username, password) .withCredentials(username, password)
.withPort(DatabaseDescriptor.getNativeTransportPort()).build(); .withPort(DatabaseDescriptor.getNativeTransportPort()).build())
try (Session session = cluster.connect())
{ {
for (String query : queries) try (Session session = cluster.connect())
session.execute(query); {
for (String query : queries)
session.execute(query);
}
catch (AuthenticationException e)
{
if (expectedAuthType == null)
throw e;
authFailed = true;
}
} }
catch (AuthenticationException e)
{
authFailed = true;
}
cluster.close();
if (expectedAuthType == null) return null; if (expectedAuthType == null) return null;