Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-06 01:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-13496 Included Hadoop configuration file paths in the classloader isolation key of HDFS processors

Browse Source 
Signed-off-by: Mark Bathori <mbathori@apache.org>

This closes #9038
This commit is contained in:
Peter Turcsanyi 2024-06-21 15:18:45 +02:00 committed by Mark Bathori
parent c73d1cf634
commit f57a96dbfb
No known key found for this signature in database
GPG Key ID: 32DC6BA5A13FAA04
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
View File

@ -212,9 +212,33 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen
@Override
public String getClassloaderIsolationKey(final PropertyContext context) {
class ClassloaderIsolationKeyBuilder {
private static final String SEPARATOR = "__";
private final StringBuilder sb = new StringBuilder();
void add(final String value) {
if (value != null) {
if (sb.length() > 0) {
sb.append(SEPARATOR);
}
sb.append(value);
}
}
String build() {
return sb.length() > 0 ? sb.toString() : null;
}
}
final ClassloaderIsolationKeyBuilder builder = new ClassloaderIsolationKeyBuilder();
builder.add(context.getProperty(HADOOP_CONFIGURATION_RESOURCES).getValue());
builder.add(context.getProperty(ADDITIONAL_CLASSPATH_RESOURCES).getValue());
final String explicitKerberosPrincipal = context.getProperty(kerberosProperties.getKerberosPrincipal()).evaluateAttributeExpressions().getValue();
if (explicitKerberosPrincipal != null) {
return explicitKerberosPrincipal;
builder.add(explicitKerberosPrincipal);
}
try {
@ -222,20 +246,20 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen
if (credentialsService != null) {
final String credentialsServicePrincipal = credentialsService.getPrincipal();
if (credentialsServicePrincipal != null) {
return credentialsServicePrincipal;
builder.add(credentialsServicePrincipal);
}
}
final KerberosUserService kerberosUserService = context.getProperty(KERBEROS_USER_SERVICE).asControllerService(KerberosUserService.class);
if (kerberosUserService != null) {
final KerberosUser kerberosUser = kerberosUserService.createKerberosUser();
return kerberosUser.getPrincipal();
builder.add(kerberosUser.getPrincipal());
}
} catch (IllegalStateException e) {
return null;
// the Kerberos controller service is disabled, therefore this part of the isolation key cannot be determined yet
}
return null;
return builder.build();
}
@Override