commit 70822b9c8d9105518f759f44ff4f828fc3fb6732
author ahmed shaaban <ahmed@localhost.localdomain> Mon Dec 06 23:17:02 2021 +0200
committer Joe Witt <joewitt@apache.org> Tue Dec 07 08:17:31 2021 -0700
tree 6275cae06ce2e965862d1f94f31657a20d8b043b
parent 1eb4264e3469069a665ac87868515c8b973e3dc3

NIFI-9093 This closes #5578. GetSplunk Processor hangs addressed by adding timeouts.
changed the required flag to false on ConnectTimeout and ReadTimeout properties

Signed-off-by: Joe Witt <joewitt@apache.org>

nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java

diff --git a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java
index f1721b4..58ab04f 100644
--- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java
+++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java
@@ -65,6 +65,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @TriggerSerially
@@ -105,6 +106,20 @@
             .addValidator(StandardValidators.PORT_VALIDATOR)
             .defaultValue("8089")
             .build();
+    public static final PropertyDescriptor CONNECT_TIMEOUT = new PropertyDescriptor.Builder()
+            .name("Connection Timeout")
+            .description("Max wait time for connection to the Splunk server.")
+            .required(false)
+            .defaultValue("5 secs")
+            .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+            .build();
+    public static final PropertyDescriptor READ_TIMEOUT = new PropertyDescriptor.Builder()
+            .name("Read Timeout")
+            .description("Max wait time for response from the Splunk server.")
+            .required(false)
+            .defaultValue("15 secs")
+            .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+            .build();
     public static final PropertyDescriptor QUERY = new PropertyDescriptor.Builder()
             .name("Query")
             .description("The query to execute. Typically beginning with a <search> command followed by a search clause, " +
@@ -256,6 +271,8 @@
         descriptors.add(SCHEME);
         descriptors.add(HOSTNAME);
         descriptors.add(PORT);
+        descriptors.add(CONNECT_TIMEOUT);
+        descriptors.add(READ_TIMEOUT);
         descriptors.add(QUERY);
         descriptors.add(TIME_FIELD_STRATEGY);
         descriptors.add(TIME_RANGE_STRATEGY);
@@ -516,6 +533,12 @@
         final int port = context.getProperty(PORT).asInteger();
         serviceArgs.setPort(port);
 
+        final int connect_timeout = context.getProperty(CONNECT_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue();
+        serviceArgs.add("connectTimeout",connect_timeout);
+
+        final int read_timeout = context.getProperty(READ_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue();
+        serviceArgs.add("readTimeout",read_timeout);
+
         final String app = context.getProperty(APP).getValue();
         if (!StringUtils.isBlank(app)) {
             serviceArgs.setApp(app);