[nifi] branch master updated: NIFI-6179: minor changes to DruidTranquilityController

[mattyb149]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new e907b68  NIFI-6179: minor changes to DruidTranquilityController
e907b68 is described below

commit e907b689e8ea4ae9deb30812d43d66a23440b6ae
Author: Endre Zoltan Kovacs <ekov...@hortonworks.com>
AuthorDate: Wed Apr 3 16:09:35 2019 +0200

    NIFI-6179: minor changes to DruidTranquilityController
    
    - hooking in property INDEX_RETRY_PERIOD to list of properties
    - fixing property description
    
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>
    
    This closes #3402
---
 .../org/apache/nifi/controller/druid/DruidTranquilityController.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/src/main/java/org/apache/nifi/controller/druid/DruidTranquilityController.java
 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/src/main/java/org/apache/nifi/controller/druid/DruidTranquilityController.java
index 5d617f7..0690264 100644
--- 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/src/main/java/org/apache/nifi/controller/druid/DruidTranquilityController.java
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/src/main/java/org/apache/nifi/controller/druid/DruidTranquilityController.java
@@ -259,7 +259,7 @@ public class DruidTranquilityController extends 
AbstractControllerService implem
     public static final PropertyDescriptor INDEX_RETRY_PERIOD = new 
PropertyDescriptor.Builder()
             .name("druid-cs-index-retry-period")
             .displayName("Index Retry Period")
-            .description("Grace period to allow late arriving events for real 
time ingest.")
+            .description("Time period, until a transiently failing indexing 
service overlord call is retried, before giving up.")
             .required(true)
             .allowableValues(PT1M, PT10M, PT60M)
             .defaultValue(PT10M.getValue())
@@ -330,6 +330,7 @@ public class DruidTranquilityController extends 
AbstractControllerService implem
         props.add(AGGREGATOR_JSON);
         props.add(SEGMENT_GRANULARITY);
         props.add(QUERY_GRANULARITY);
+        props.add(INDEX_RETRY_PERIOD);
         props.add(WINDOW_PERIOD);
         props.add(TIMESTAMP_FIELD);
         props.add(MAX_BATCH_SIZE);