diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTrinoQueueLengthRoutingTable.java b/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTrinoQueueLengthRoutingTable.java index ddfb9a3e4..0382179e9 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTrinoQueueLengthRoutingTable.java +++ b/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTrinoQueueLengthRoutingTable.java @@ -190,15 +190,11 @@ public void testRoutingWithEvenWeightDistribution() resetBackends(mockRoutingGroup, numBk, queueDistribution, runningDistribution); Map 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 { @@ -222,14 +218,10 @@ public void testRoutingWithSkewedWeightDistribution() Map 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 { @@ -310,17 +302,13 @@ public void testRoutingWithEqualWeightDistribution() resetBackends(mockRoutingGroup, numBk, queueDistribution, runningDistribution); Map 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)); @@ -370,15 +358,11 @@ public void testRoutingWithMultipleGroups() resetBackends(grp, numBk, queueDistribution, 0); Map 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 { @@ -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(); }