Skip to content

Use Descriptable.as method for debug message #218

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
ebyhr merged 1 commit into from
Jan 30, 2024
Merged

Use Descriptable.as method for debug message #218

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
39 changes: 11 additions & 28 deletions gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTrinoQueueLengthRoutingTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,11 @@ public void testRoutingWithEvenWeightDistribution()
resetBackends(mockRoutingGroup, numBk, queueDistribution, runningDistribution);
Map<String, Integer> routingDistribution = routeQueries(mockRoutingGroup, numRequests);

// Useful for debugging
//System.out.println("Input :" + clusterQueueMap.toString() + " Num of Requests:"
// + numRequests
// + " Internal Routing table: "
// + routingTable.getInternalWeightedRoutingTable(mockRoutingGroup).toString()
// + " Distribution: " + routingDistribution.toString());
if (numBk > 1) {
if (routingDistribution.containsKey(mockRoutingGroup + (numBk - 1))) {
assertThat(routingDistribution.get(mockRoutingGroup + (numBk - 1)) <= Math.ceil(numRequests / numBk))
.as("Input: %s, Num of Requests: %s, Internal Routing table: %s, Distribution: %s",
clusterQueueMap, numRequests, routingTable.getInternalWeightedRoutingTable(mockRoutingGroup), routingDistribution)
.isTrue();
}
else {
Expand All @@ -222,14 +218,10 @@ public void testRoutingWithSkewedWeightDistribution()

Map<String, Integer> routingDistribution = routeQueries(mockRoutingGroup, numRequests);

// Useful Debugging Info
//System.out.println("Input :" + clusterQueueMap.toString() + " Num of Requests:"
// + numRequests
// + " Internal Routing table: "
// + routingTable.getInternalWeightedRoutingTable(mockRoutingGroup).toString()
// + " Distribution: " + routingDistribution.toString());
if (numBk > 2 && routingDistribution.containsKey(mockRoutingGroup + (numBk - 1))) {
assertThat(routingDistribution.get(mockRoutingGroup + (numBk - 1)) <= Math.ceil(numRequests / numBk))
.as("Input: %s, Num of Requests: %s, Internal Routing table: %s, Distribution: %s",
clusterQueueMap, numRequests, routingTable.getInternalWeightedRoutingTable(mockRoutingGroup), routingDistribution)
.isTrue();
}
else {
Expand Down Expand Up @@ -310,17 +302,13 @@ public void testRoutingWithEqualWeightDistribution()
resetBackends(mockRoutingGroup, numBk, queueDistribution, runningDistribution);
Map<String, Integer> routingDistribution = routeQueries(mockRoutingGroup, numRequests);

//Useful Debugging Info
//System.out.println("Input :" + clusterQueueMap.toString() + " Num of Requests:" +
//numRequests
//+ " Internal Routing table: " + routingTable.getInternalWeightedRoutingTable
//(mockRoutingGroup).toString()
//+ " Distribution: " + routingDistribution.toString());

if (numBk > 1) {
// With equal weights, the algorithm randomly chooses from the list. Check that the
// distribution spans atleast half of the routing group.
assertThat(routingDistribution.size() >= clusterQueueMap.row(mockRoutingGroup).size() / 2).isTrue();
assertThat(routingDistribution.size() >= clusterQueueMap.row(mockRoutingGroup).size() / 2)
.as("Input: %s, Num of Requests: %s, Internal Routing table: %s, Distribution: %s",
clusterQueueMap, numRequests, routingTable.getInternalWeightedRoutingTable(mockRoutingGroup), routingDistribution)
.isTrue();
}
else {
assertThat(routingDistribution.get(mockRoutingGroup + '0')).isEqualTo(Integer.valueOf(numRequests));
Expand Down Expand Up @@ -370,15 +358,11 @@ public void testRoutingWithMultipleGroups()
resetBackends(grp, numBk, queueDistribution, 0);
Map<String, Integer> routingDistribution = routeQueries(grp, numRequests);

// Useful for debugging
//System.out.println("Input :" + clusterQueueMap.toString() + " Num of Requests:" +
//numRequests
//+ " Internal Routing table: " + routingTable.getInternalWeightedRoutingTable
//(grp).toString()
//+ " Distribution: " + routingDistribution.toString());
if (numBk > 1) {
if (routingDistribution.containsKey(grp + (numBk - 1))) {
assertThat(routingDistribution.get(grp + (numBk - 1)) <= Math.ceil(numRequests / numBk))
.as("Input: %s, Num of Requests: %s, Internal Routing table: %s, Distribution: %s",
clusterQueueMap, numRequests, routingTable.getInternalWeightedRoutingTable(grp), routingDistribution)
.isTrue();
}
else {
Expand Down Expand Up @@ -443,9 +427,8 @@ public void testActiveClusterMonitorUpdateAndRouting()
Thread.sleep(270);
}

System.out.println("Total Requests :" + numBatches * numRequests
+ " distribution :" + totalDistribution);
assertThat(totalDistribution.get(mockRoutingGroup + (numBk - 1)) <= (numBatches * numRequests / numBk))
.as("Total Requests: %s, distribution: %s", numBatches * numRequests, totalDistribution)
.isTrue();
scheduler.shutdown();
}
Expand Down