You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tk...@apache.org on 2015/11/13 04:15:26 UTC

nifi git commit: NIFI-1127 Adding Kerberos properties to FetchHDFS and ListHDFS.

Repository: nifi
Updated Branches:
  refs/heads/master db7b94b80 -> 33ef59c5b


NIFI-1127 Adding Kerberos properties to FetchHDFS and ListHDFS.

Reviewed by Tony Kurc (tkurc@apache.org)


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/33ef59c5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/33ef59c5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/33ef59c5

Branch: refs/heads/master
Commit: 33ef59c5bad3715d2a4625d88f018e7adc09a7b4
Parents: db7b94b
Author: Bryan Bende <bb...@apache.org>
Authored: Thu Nov 12 22:14:05 2015 -0500
Committer: Tony Kurc <tr...@gmail.com>
Committed: Thu Nov 12 22:14:12 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/processors/hadoop/AbstractHadoopProcessor.java    | 2 +-
 .../main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java    | 3 +++
 .../src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/33ef59c5/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index a67a9fd..9e89c3a 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -133,7 +133,7 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor {
             .description("Kerberos keytab associated with the principal. Requires nifi.kerberos.krb5.file to be set " + "in your nifi.properties").addValidator(Validator.VALID)
             .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).addValidator(KERBEROS_CONFIG_VALIDATOR).build();
 
-    private static final PropertyDescriptor KERBEROS_RELOGIN_PERIOD = new PropertyDescriptor.Builder().name("Kerberos Relogin Period").required(false)
+    public static final PropertyDescriptor KERBEROS_RELOGIN_PERIOD = new PropertyDescriptor.Builder().name("Kerberos Relogin Period").required(false)
             .description("Period of time which should pass before attempting a kerberos relogin").defaultValue("4 hours")
             .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();

http://git-wip-us.apache.org/repos/asf/nifi/blob/33ef59c5/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
index c27ade9..6434e5e 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
@@ -83,6 +83,9 @@ public class FetchHDFS extends AbstractHadoopProcessor {
         final List<PropertyDescriptor> properties = new ArrayList<>();
         properties.add(HADOOP_CONFIGURATION_RESOURCES);
         properties.add(FILENAME);
+        properties.add(KERBEROS_PRINCIPAL);
+        properties.add(KERBEROS_KEYTAB);
+        properties.add(KERBEROS_RELOGIN_PERIOD);
         return properties;
     }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/33ef59c5/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
index 563bda8..0fae4ca 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
@@ -138,6 +138,9 @@ public class ListHDFS extends AbstractHadoopProcessor {
         properties.add(DISTRIBUTED_CACHE_SERVICE);
         properties.add(DIRECTORY);
         properties.add(RECURSE_SUBDIRS);
+        properties.add(KERBEROS_PRINCIPAL);
+        properties.add(KERBEROS_KEYTAB);
+        properties.add(KERBEROS_RELOGIN_PERIOD);
         return properties;
     }