Fix tests

server/src/main/java/org/apache/druid/server/coordinator/SegmentReplicationStatusManager.java

@@ -23,6 +23,7 @@
 import it.unimi.dsi.fastutil.objects.Object2IntMaps;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
+import org.apache.druid.guice.LazySingleton;
 import org.apache.druid.metadata.SegmentsMetadataManager;
 import org.apache.druid.server.coordinator.duty.CoordinatorDuty;
 import org.apache.druid.server.coordinator.duty.RunRules;
@@ -43,6 +44,7 @@
 /**
  * Manages information about replication status of segments in a cluster.
  */
+@LazySingleton
 public class SegmentReplicationStatusManager
 {
   private final MetadataManager metadataManager;

server/src/test/java/org/apache/druid/segment/metadata/CoordinatorSegmentDataCacheConcurrencyTest.java

@@ -57,7 +57,7 @@
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.server.coordination.DruidServerMetadata;
 import org.apache.druid.server.coordination.ServerType;
-import org.apache.druid.server.coordinator.DruidCoordinator;
+import org.apache.druid.server.coordinator.SegmentReplicationStatusManager;
 import org.apache.druid.server.initialization.ServerConfig;
 import org.apache.druid.server.metrics.NoopServiceEmitter;
 import org.apache.druid.server.security.NoopEscalator;
@@ -110,7 +110,7 @@ public class CoordinatorSegmentDataCacheConcurrencyTest extends SegmentMetadataC
   private SegmentSchemaCache segmentSchemaCache;
   private SegmentSchemaBackFillQueue backFillQueue;
   private SqlSegmentsMetadataManager sqlSegmentsMetadataManager;
-  private DruidCoordinator druidCoordinator;
+  private SegmentReplicationStatusManager segmentReplicationStatusManager;
   private Supplier<SegmentsMetadataManagerConfig> segmentsMetadataManagerConfigSupplier;
   private final ObjectMapper mapper = TestHelper.makeJsonMapper();
 
@@ -206,7 +206,7 @@ public CallbackAction segmentSchemasAnnounced(SegmentSchemas segmentSchemas)
     SegmentsMetadataManagerConfig metadataManagerConfig = Mockito.mock(SegmentsMetadataManagerConfig.class);
     Mockito.when(metadataManagerConfig.getPollDuration()).thenReturn(Period.millis(1000));
     segmentsMetadataManagerConfigSupplier = Suppliers.ofInstance(metadataManagerConfig);
-    druidCoordinator = Mockito.mock(druidCoordinator);
+    segmentReplicationStatusManager = Mockito.mock(segmentReplicationStatusManager);
 
     inventoryView.init();
     initLatch.await();
@@ -247,7 +247,7 @@ public void testSegmentMetadataRefreshAndInventoryViewAddSegmentAndBrokerServerV
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -364,7 +364,7 @@ public void testSegmentMetadataRefreshAndDruidSchemaGetSegmentMetadata()
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {

server/src/test/java/org/apache/druid/segment/metadata/CoordinatorSegmentMetadataCacheTest.java

@@ -71,7 +71,7 @@
 import org.apache.druid.server.QueryResponse;
 import org.apache.druid.server.coordination.DruidServerMetadata;
 import org.apache.druid.server.coordination.ServerType;
-import org.apache.druid.server.coordinator.DruidCoordinator;
+import org.apache.druid.server.coordinator.SegmentReplicationStatusManager;
 import org.apache.druid.server.metrics.NoopServiceEmitter;
 import org.apache.druid.server.security.Access;
 import org.apache.druid.server.security.AllowAllAuthenticator;
@@ -116,7 +116,7 @@ public class CoordinatorSegmentMetadataCacheTest extends CoordinatorSegmentMetad
   private CountDownLatch buildTableLatch = new CountDownLatch(1);
   private CountDownLatch markDataSourceLatch = new CountDownLatch(1);
   private SqlSegmentsMetadataManager sqlSegmentsMetadataManager;
-  private DruidCoordinator druidCoordinator;
+  private SegmentReplicationStatusManager segmentReplicationStatusManager;
   private Supplier<SegmentsMetadataManagerConfig> segmentsMetadataManagerConfigSupplier;
 
   @Before
@@ -129,7 +129,7 @@ public void setUp() throws Exception
     SegmentsMetadataManagerConfig metadataManagerConfig = Mockito.mock(SegmentsMetadataManagerConfig.class);
     Mockito.when(metadataManagerConfig.getPollDuration()).thenReturn(Period.millis(1000));
     segmentsMetadataManagerConfigSupplier = Suppliers.ofInstance(metadataManagerConfig);
-    druidCoordinator = Mockito.mock(DruidCoordinator.class);
+    segmentReplicationStatusManager = Mockito.mock(SegmentReplicationStatusManager.class);
   }
 
   @After
@@ -161,7 +161,7 @@ public CoordinatorSegmentMetadataCache buildSchemaMarkAndTableLatch(SegmentMetad
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -336,7 +336,7 @@ public void testAllDatasourcesRebuiltOnDatasourceRemoval() throws IOException, I
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -550,7 +550,7 @@ public void testSegmentAddedCallbackAddNewHistoricalSegment() throws Interrupted
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -601,7 +601,7 @@ public void testSegmentAddedCallbackAddExistingSegment() throws InterruptedExcep
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        Mockito.mock(DruidCoordinator.class),
+        Mockito.mock(SegmentReplicationStatusManager.class),
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -656,7 +656,7 @@ public void testSegmentAddedCallbackAddNewRealtimeSegment() throws InterruptedEx
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        Mockito.mock(DruidCoordinator.class),
+        Mockito.mock(SegmentReplicationStatusManager.class),
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -708,7 +708,7 @@ public void testSegmentAddedCallbackAddNewBroadcastSegment() throws InterruptedE
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -752,7 +752,7 @@ public void testSegmentRemovedCallbackEmptyDataSourceAfterRemove() throws Interr
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -813,7 +813,7 @@ public void testSegmentRemovedCallbackNonEmptyDataSourceAfterRemove() throws Int
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -877,7 +877,7 @@ public void testServerSegmentRemovedCallbackRemoveUnknownSegment() throws Interr
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -915,7 +915,7 @@ public void testServerSegmentRemovedCallbackRemoveBrokerSegment() throws Interru
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -966,7 +966,7 @@ public void testServerSegmentRemovedCallbackRemoveHistoricalSegment() throws Int
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -1041,7 +1041,7 @@ public void testRunSegmentMetadataQueryWithContext() throws Exception
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     );
 
@@ -1213,7 +1213,7 @@ public void testRefreshShouldEmitMetrics() throws InterruptedException, IOExcept
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     )
     {
@@ -1381,7 +1381,7 @@ public void testRealtimeSchemaAnnouncement() throws InterruptedException, IOExce
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     ) {
       @Override
@@ -1463,7 +1463,7 @@ public void testRealtimeSchemaAnnouncementDataSourceSchemaUpdated() throws Inter
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     ) {
       @Override
@@ -1646,7 +1646,7 @@ public void testSchemaBackfilling() throws InterruptedException
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     ) {
       @Override
@@ -1829,7 +1829,7 @@ public void testColdDatasourceSchema() throws IOException
         new SegmentSchemaCache.FinalizedSegmentSchemaInfo(segmentStatsMap.build(), schemaPayloadMap.build())
     );
 
-    Mockito.when(druidCoordinator.getReplicationFactor(ArgumentMatchers.eq(coldSegment.getId()))).thenReturn(0);
+    Mockito.when(segmentReplicationStatusManager.getReplicationFactor(ArgumentMatchers.eq(coldSegment.getId()))).thenReturn(0);
 
     ImmutableDruidDataSource druidDataSource =
         new ImmutableDruidDataSource(
@@ -1850,7 +1850,7 @@ public void testColdDatasourceSchema() throws IOException
         segmentSchemaCache,
         backFillQueue,
         sqlSegmentsMetadataManager,
-        druidCoordinator,
+        segmentReplicationStatusManager,
         segmentsMetadataManagerConfigSupplier
     );