This is an automated email from the ASF dual-hosted git repository.
karan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 24f9b11c57b Fix Flaky BasicAuthTest and MetadataResourceTest (#17736)
24f9b11c57b is described below
commit 24f9b11c57b56542dd0d83a5952521835740f8fa
Author: Rishabh Singh <[email protected]>
AuthorDate: Tue Feb 18 19:36:16 2025 +0530
Fix Flaky BasicAuthTest and MetadataResourceTest (#17736)
* Upgrade grpc pom to 1.70.0
* fix flakiness in MetadataResourceTest#testGetAllSegmentsIncludingRealtime
---
extensions-contrib/grpc-query/pom.xml | 2 +-
.../org/apache/druid/server/http/MetadataResourceTest.java | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/extensions-contrib/grpc-query/pom.xml
b/extensions-contrib/grpc-query/pom.xml
index e652e0d15e8..ccfc1f9ec24 100644
--- a/extensions-contrib/grpc-query/pom.xml
+++ b/extensions-contrib/grpc-query/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
- <version>1.59.0</version>
+ <version>1.70.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/server/src/test/java/org/apache/druid/server/http/MetadataResourceTest.java
b/server/src/test/java/org/apache/druid/server/http/MetadataResourceTest.java
index 049d1d7c523..7966f81cebe 100644
---
a/server/src/test/java/org/apache/druid/server/http/MetadataResourceTest.java
+++
b/server/src/test/java/org/apache/druid/server/http/MetadataResourceTest.java
@@ -61,6 +61,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
public class MetadataResourceTest
@@ -251,13 +252,14 @@ public class MetadataResourceTest
final List<SegmentStatusInCluster> resultList =
extractResponseList(response);
Assert.assertEquals(resultList.size(), 6);
- Assert.assertEquals(new SegmentStatusInCluster(segments[0], false, 2, 20L,
false), resultList.get(0));
- Assert.assertEquals(new SegmentStatusInCluster(segments[1], false, null,
30L, false), resultList.get(1));
- Assert.assertEquals(new SegmentStatusInCluster(segments[2], false, 1,
null, false), resultList.get(2));
+ Map<SegmentId, SegmentStatusInCluster> resultMap =
resultList.stream().collect(Collectors.toMap(segmentStatus ->
segmentStatus.getDataSegment().getId(), Function.identity()));
+ Assert.assertEquals(new SegmentStatusInCluster(segments[0], false, 2, 20L,
false), resultMap.get(segments[0].getId()));
+ Assert.assertEquals(new SegmentStatusInCluster(segments[1], false, null,
30L, false), resultMap.get(segments[1].getId()));
+ Assert.assertEquals(new SegmentStatusInCluster(segments[2], false, 1,
null, false), resultMap.get(segments[2].getId()));
// Replication factor should be 0 as the segment is overshadowed
- Assert.assertEquals(new SegmentStatusInCluster(segments[3], true, 0, null,
false), resultList.get(3));
- Assert.assertEquals(new SegmentStatusInCluster(realTimeSegments[0], false,
null, 10L, true), resultList.get(4));
- Assert.assertEquals(new SegmentStatusInCluster(realTimeSegments[1], false,
null, 40L, true), resultList.get(5));
+ Assert.assertEquals(new SegmentStatusInCluster(segments[3], true, 0, null,
false), resultMap.get(segments[3].getId()));
+ Assert.assertEquals(new SegmentStatusInCluster(realTimeSegments[0], false,
null, 10L, true), resultMap.get(realTimeSegments[0].getId()));
+ Assert.assertEquals(new SegmentStatusInCluster(realTimeSegments[1], false,
null, 40L, true), resultMap.get(realTimeSegments[1].getId()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
