Skip to content

3.x: fix ShardAwarenessTest.correctShardInTracingTest for Scylla 2025.1 #931

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

Merged
dkropachev merged 1 commit into from
Jun 27, 2026
Merged

3.x: fix ShardAwarenessTest.correctShardInTracingTest for Scylla 2025.1 #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions driver-core/src/test/java/com/datastax/driver/core/ShardAwarenessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,25 @@ private void verifyCorrectShardSingleRow(String pk, String ck, String v, String
event.getSource(),
event.getThreadName(),
event.getDescription());
assertThat(event.getThreadName()).startsWith(shard);
// Only data-local events carry the owning shard. Scylla 2025.1 adds coordinator-side
// events that legitimately run on shard 0 regardless of the data shard. Also, since
// Scylla 2025.1 the thread name carries a service-level suffix ("shard N/sl:<level>"),
// so strip it before comparing.
if (event.getDescription().contains("querying locally")) {
anyLocal = true;
String normalized = event.getThreadName().replaceFirst("/sl:[^/]*$", "");
assertThat(normalized).startsWith(shard);
}
}
assertThat(anyLocal);
assertTrue(anyLocal, "No 'querying locally' trace event was observed for the query");
}

@Test(groups = "short")
public void correctShardInTracingTest() {
session().execute("DROP KEYSPACE IF EXISTS shardawaretest");
session()
.execute(
"CREATE KEYSPACE shardawaretest WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': '3'}");
"CREATE KEYSPACE shardawaretest WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': '3'} AND TABLETS = {'enabled': false}");
session()
.execute("CREATE TABLE shardawaretest.t (pk text, ck text, v text, PRIMARY KEY (pk, ck))");

Expand Down
Loading