From c2c482dd94035c0663474b752d9db1cfd6c79b6b Mon Sep 17 00:00:00 2001 From: Caroline Date: Wed, 29 Sep 2021 16:36:33 -0700 Subject: [PATCH 1/2] change default segment loading to http --- docs/configuration/index.md | 2 +- .../apache/druid/server/coordinator/DruidCoordinatorConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/configuration/index.md b/docs/configuration/index.md index 52b77e1d4327..befe679a40b4 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -775,7 +775,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 14e3ce08ffc7..838b59dfd3ea 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 @@ -106,7 +106,7 @@ public Duration getLoadQueuePeonRepeatDelay() @Config("druid.coordinator.loadqueuepeon.type") public String getLoadQueuePeonType() { - return "curator"; + return "http"; } @Config("druid.coordinator.curator.loadqueuepeon.numCallbackThreads") From 143009460c5e2aabf5ffe0b145801179a22d60b7 Mon Sep 17 00:00:00 2001 From: Caroline Date: Fri, 21 Jan 2022 16:20:35 -0800 Subject: [PATCH 2/2] add to DruidCoordinatorConfigTest --- .../druid/server/coordinator/DruidCoordinatorConfigTest.java | 3 +++ 1 file changed, 3 insertions(+) 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 084e6320dc6b..94adbd5fa33a 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(0, 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()); //with non-defaults @@ -61,6 +62,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"); factory = Config.createFactory(props); @@ -74,6 +76,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()); } }