This is an automated email from the ASF dual-hosted git repository.
kfaraz 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 f5cc823d0f Handle nulls in DruidCoordinator.getReplicationFactor
(#14447)
f5cc823d0f is described below
commit f5cc823d0f8acdf660860fcb75db34e38c039d8f
Author: Adarsh Sanjeev <[email protected]>
AuthorDate: Tue Jun 20 15:25:57 2023 +0530
Handle nulls in DruidCoordinator.getReplicationFactor (#14447)
---
.../java/org/apache/druid/server/coordinator/DruidCoordinator.java | 6 +++---
.../org/apache/druid/server/coordinator/DruidCoordinatorTest.java | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
index 32c56bd032..0c5e79bdcb 100644
---
a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
+++
b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
@@ -302,11 +302,11 @@ public class DruidCoordinator
@Nullable
public Integer getReplicationFactor(SegmentId segmentId)
{
- if (segmentReplicationStatus != null) {
- return
segmentReplicationStatus.getReplicaCountsInCluster(segmentId).required();
- } else {
+ if (segmentReplicationStatus == null) {
return null;
}
+ SegmentReplicaCount replicaCountsInCluster =
segmentReplicationStatus.getReplicaCountsInCluster(segmentId);
+ return replicaCountsInCluster == null ? null :
replicaCountsInCluster.required();
}
@Nullable
diff --git
a/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java
b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java
index dd442405cd..6c0ab813b3 100644
---
a/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java
+++
b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorTest.java
@@ -249,6 +249,9 @@ public class DruidCoordinatorTest extends CuratorTestBase
EasyMock.replay(serverInventoryView, loadQueueTaskMaster);
coordinator.start();
+
+ Assert.assertNull(coordinator.getReplicationFactor(dataSegment.getId()));
+
// Wait for this coordinator to become leader
leaderAnnouncerLatch.await();
@@ -306,6 +309,7 @@ public class DruidCoordinatorTest extends CuratorTestBase
// the segments are replicated as many times as they can be given state of
cluster, therefore should not be
// under-replicated.
Assert.assertEquals(0L,
underRepliicationCountsPerDataSourceUsingClusterView.getLong(dataSource));
+ Assert.assertEquals(Integer.valueOf(2),
coordinator.getReplicationFactor(dataSegment.getId()));
coordinator.stop();
leaderUnannouncerLatch.await();
@@ -398,6 +402,8 @@ public class DruidCoordinatorTest extends CuratorTestBase
Assert.assertEquals(0L,
underReplicationCountsPerDataSourcePerTierUsingClusterView.get(hotTierName).getLong(dataSource));
Assert.assertEquals(0L,
underReplicationCountsPerDataSourcePerTierUsingClusterView.get(coldTierName).getLong(dataSource));
+ dataSegments.values().forEach(dataSegment ->
Assert.assertEquals(Integer.valueOf(1),
coordinator.getReplicationFactor(dataSegment.getId())));
+
coordinator.stop();
leaderUnannouncerLatch.await();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
