From 4801de62a27d4673c6596f8d8128b478d82e9ecd Mon Sep 17 00:00:00 2001 From: sahner Date: Fri, 24 Jul 2015 09:01:16 -0500 Subject: [PATCH] make "announce" the chathandler default in realtime node, remove doc references to chathandler type "announce" since it is the default now, --- docs/content/configuration/indexing-service.md | 1 - docs/content/ingestion/firehose.md | 5 ++--- services/src/main/java/io/druid/guice/RealtimeModule.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/content/configuration/indexing-service.md b/docs/content/configuration/indexing-service.md index 96993765f74..8f9ee327f0a 100644 --- a/docs/content/configuration/indexing-service.md +++ b/docs/content/configuration/indexing-service.md @@ -271,7 +271,6 @@ Additional peon configs include: |`druid.indexer.task.hadoopWorkingPath`|Temporary working directory for Hadoop tasks.|/tmp/druid-indexing| |`druid.indexer.task.defaultRowFlushBoundary`|Highest row count before persisting to disk. Used for indexing generating tasks.|50000| |`druid.indexer.task.defaultHadoopCoordinates`|Hadoop version to use with HadoopIndexTasks that do not request a particular version.|org.apache.hadoop:hadoop-client:2.3.0| -|`druid.indexer.task.chathandler.type`|Choices are "noop" and "announce". Certain tasks will use service discovery to announce an HTTP endpoint that events can be posted to.|noop| If the peon is running in remote mode, there must be an overlord up and running. Peons in remote mode can set the following configurations: diff --git a/docs/content/ingestion/firehose.md b/docs/content/ingestion/firehose.md index 9722717ac20..818f15df7c2 100644 --- a/docs/content/ingestion/firehose.md +++ b/docs/content/ingestion/firehose.md @@ -178,8 +178,7 @@ This can be used to merge data from more than one firehoses. #### EventReceiverFirehose -EventReceiverFirehoseFactory can be used to ingest events using http endpoint. -when using this firehose `druid.realtime.chathandler.type` needs to be set to `announce` in runtime.properties. +EventReceiverFirehoseFactory can be used to ingest events using an http endpoint. ```json { @@ -188,7 +187,7 @@ when using this firehose `druid.realtime.chathandler.type` needs to be set to `a "bufferSize": 10000 } ``` -when using above firehose the events can be sent via submitting a POST request to the http endpoint - +When using this firehose, events can be sent by submitting a POST request to the http endpoint - `http://:/druid/worker/v1/chat//push-events/` |property|description|required?| diff --git a/services/src/main/java/io/druid/guice/RealtimeModule.java b/services/src/main/java/io/druid/guice/RealtimeModule.java index df4c08c99d7..784aa7958be 100644 --- a/services/src/main/java/io/druid/guice/RealtimeModule.java +++ b/services/src/main/java/io/druid/guice/RealtimeModule.java @@ -65,7 +65,7 @@ public class RealtimeModule implements Module binder, "druid.realtime.chathandler.type", Key.get(ChatHandlerProvider.class), - Key.get(NoopChatHandlerProvider.class) + Key.get(ServiceAnnouncingChatHandlerProvider.class) ); final MapBinder handlerProviderBinder = PolyBind.optionBinder( binder, Key.get(ChatHandlerProvider.class)