diff --git a/docs/configuration/index.md b/docs/configuration/index.md index 82d6cdf4eb23..f3a31ad2de76 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -845,7 +845,7 @@ These Coordinator static configurations can be defined in the `coordinator/runti |Property|Possible Values|Description|Default| |--------|---------------|-----------|-------| |`druid.serverview.type`|batch or http|Segment discovery method to use. "http" enables discovering segments using HTTP instead of ZooKeeper.|batch| -|`druid.coordinator.loadqueuepeon.type`|curator or http|Whether to use "http" or "curator" implementation to assign segment loads/drops to historical|curator| +|`druid.coordinator.loadqueuepeon.type`|curator or http|Whether to use "http" or "curator" implementation to assign segment loads/drops to historical|http| |`druid.coordinator.segment.awaitInitializationOnStart`|true or false|Whether the Coordinator will wait for its view of segments to fully initialize before starting up. If set to 'true', the Coordinator's HTTP server will not start up, and the Coordinator will not announce itself as available, until the server view is initialized.|true| ###### Additional config when "http" loadqueuepeon is used diff --git a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java index c02baf9cc64b..cdd708ea9d30 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinatorConfig.java @@ -110,7 +110,7 @@ public Duration getLoadQueuePeonRepeatDelay() @Config("druid.coordinator.loadqueuepeon.type") public String getLoadQueuePeonType() { - return "curator"; + return "http"; } @Config("druid.coordinator.curator.loadqueuepeon.numCallbackThreads") diff --git a/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java index 169ad39fa0d0..7cfc7b6e61b4 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/DruidCoordinatorConfigTest.java @@ -47,6 +47,7 @@ public void testDeserialization() Assert.assertEquals(100, config.getCoordinatorKillMaxSegments()); Assert.assertEquals(new Duration(15 * 60 * 1000), config.getLoadTimeoutDelay()); Assert.assertEquals(Duration.millis(50), config.getLoadQueuePeonRepeatDelay()); + Assert.assertEquals("http", config.getLoadQueuePeonType()); Assert.assertTrue(config.getCompactionSkipLockedIntervals()); Assert.assertFalse(config.getCoordinatorKillIgnoreDurationToRetain()); @@ -62,6 +63,7 @@ public void testDeserialization() props.setProperty("druid.coordinator.kill.pendingSegments.on", "true"); props.setProperty("druid.coordinator.load.timeout", "PT1s"); props.setProperty("druid.coordinator.loadqueuepeon.repeatDelay", "PT0.100s"); + props.setProperty("druid.coordinator.loadqueuepeon.type", "curator"); props.setProperty("druid.coordinator.compaction.skipLockedIntervals", "false"); props.setProperty("druid.coordinator.kill.ignoreDurationToRetain", "true"); @@ -76,6 +78,7 @@ public void testDeserialization() Assert.assertEquals(10000, config.getCoordinatorKillMaxSegments()); Assert.assertEquals(new Duration("PT1s"), config.getLoadTimeoutDelay()); Assert.assertEquals(Duration.millis(100), config.getLoadQueuePeonRepeatDelay()); + Assert.assertEquals("curator", config.getLoadQueuePeonType()); Assert.assertFalse(config.getCompactionSkipLockedIntervals()); Assert.assertTrue(config.getCoordinatorKillIgnoreDurationToRetain());