[nifi] branch support/nifi-1.x updated: NIFI-11342: HDFS processors fail to get ClassloaderIsolationKey at startup

[turcsanyi]

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

turcsanyi pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 79097835a6 NIFI-11342: HDFS processors fail to get 
ClassloaderIsolationKey at startup
79097835a6 is described below

commit 79097835a6df718bf4b6756963e4eececd7b5694
Author: Mark Bathori <bathori.m...@gmail.com>
AuthorDate: Tue Apr 4 16:42:35 2023 +0200

    NIFI-11342: HDFS processors fail to get ClassloaderIsolationKey at startup
    
    This closes #7121.
    
    Signed-off-by: Peter Turcsanyi <turcsa...@apache.org>
---
 .../processors/hadoop/AbstractHadoopProcessor.java | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index a967b9037a..f594ed2549 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -211,18 +211,22 @@ public abstract class AbstractHadoopProcessor extends 
AbstractProcessor implemen
             return explicitKerberosPrincipal;
         }
 
-        final KerberosCredentialsService credentialsService = 
context.getProperty(KERBEROS_CREDENTIALS_SERVICE).asControllerService(KerberosCredentialsService.class);
-        if (credentialsService != null) {
-            final String credentialsServicePrincipal = 
credentialsService.getPrincipal();
-            if (credentialsServicePrincipal != null) {
-                return credentialsServicePrincipal;
+        try {
+            final KerberosCredentialsService credentialsService = 
context.getProperty(KERBEROS_CREDENTIALS_SERVICE).asControllerService(KerberosCredentialsService.class);
+            if (credentialsService != null) {
+                final String credentialsServicePrincipal = 
credentialsService.getPrincipal();
+                if (credentialsServicePrincipal != null) {
+                    return credentialsServicePrincipal;
+                }
             }
-        }
 
-        final KerberosUserService kerberosUserService = 
context.getProperty(KERBEROS_USER_SERVICE).asControllerService(KerberosUserService.class);
-        if (kerberosUserService != null) {
-            final KerberosUser kerberosUser = 
kerberosUserService.createKerberosUser();
-            return kerberosUser.getPrincipal();
+            final KerberosUserService kerberosUserService = 
context.getProperty(KERBEROS_USER_SERVICE).asControllerService(KerberosUserService.class);
+            if (kerberosUserService != null) {
+                final KerberosUser kerberosUser = 
kerberosUserService.createKerberosUser();
+                return kerberosUser.getPrincipal();
+            }
+        } catch (IllegalStateException e) {
+            return null;
         }
 
         return null;