Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-2927: Added Validation Query to HiveConnectionPool 

This closes #1252.

Signed-off-by: Bryan Bende <bbende@apache.org>
This commit is contained in:
Matt Burgess 2016-11-15 12:00:46 -05:00 committed by Bryan Bende
parent 7e7739819a
commit eb5abf809d
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
View File

@ -122,6 +122,18 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
.sensitive(false) .sensitive(false)
.build(); .build();
public static final PropertyDescriptor VALIDATION_QUERY = new PropertyDescriptor.Builder()
.name("Validation-query")
.displayName("Validation query")
.description("Validation query used to validate connections before returning them. "
+ "When a borrowed connection is invalid, it gets dropped and a new valid connection will be returned. "
+ "NOTE: Using validation may have a performance penalty.")
.required(false)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(true)
.build();
private static final long TICKET_RENEWAL_PERIOD = 60000; private static final long TICKET_RENEWAL_PERIOD = 60000;
private List<PropertyDescriptor> properties; private List<PropertyDescriptor> properties;
@ -147,6 +159,7 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
props.add(DB_PASSWORD); props.add(DB_PASSWORD);
props.add(MAX_WAIT_TIME); props.add(MAX_WAIT_TIME);
props.add(MAX_TOTAL_CONNECTIONS); props.add(MAX_TOTAL_CONNECTIONS);
props.add(VALIDATION_QUERY);
kerberosConfigFile = context.getKerberosConfigurationFile(); kerberosConfigFile = context.getKerberosConfigurationFile();
kerberosProperties = new KerberosProperties(kerberosConfigFile); kerberosProperties = new KerberosProperties(kerberosConfigFile);
@ -197,6 +210,7 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).getValue(); final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).getValue();
final Configuration hiveConfig = hiveConfigurator.getConfigurationFromFiles(configFiles); final Configuration hiveConfig = hiveConfigurator.getConfigurationFromFiles(configFiles);
final String validationQuery = context.getProperty(VALIDATION_QUERY).evaluateAttributeExpressions().getValue();
// add any dynamic properties to the Hive configuration // add any dynamic properties to the Hive configuration
for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties().entrySet()) { for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties().entrySet()) {
@ -233,6 +247,11 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
dataSource.setMaxWait(maxWaitMillis); dataSource.setMaxWait(maxWaitMillis);
dataSource.setMaxActive(maxTotal); dataSource.setMaxActive(maxTotal);
if (validationQuery != null && !validationQuery.isEmpty()) {
dataSource.setValidationQuery(validationQuery);
dataSource.setTestOnBorrow(true);
}
dataSource.setUrl(dburl); dataSource.setUrl(dburl);
dataSource.setUsername(user); dataSource.setUsername(user);
dataSource.setPassword(passw); dataSource.setPassword(passw);