You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/10/14 13:24:54 UTC
nifi git commit: NIFI-2873: Nifi throws UnknownHostException with HA
NameNode
Repository: nifi
Updated Branches:
refs/heads/master 710761642 -> e969a5ffe
NIFI-2873: Nifi throws UnknownHostException with HA NameNode
Signed-off-by: Matt Burgess <ma...@apache.org>
NIFI-2873: Changed test hive-site.xml to use local FS, fixed Checkstyle violations
This closes #1113
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e969a5ff
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e969a5ff
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e969a5ff
Branch: refs/heads/master
Commit: e969a5ffe3a1e03b0b6a0f0a11e954dc396bf25a
Parents: 7107616
Author: d810146 <na...@team.telstra.com>
Authored: Fri Oct 7 13:27:30 2016 +1100
Committer: Matt Burgess <ma...@apache.org>
Committed: Fri Oct 14 09:23:19 2016 -0400
----------------------------------------------------------------------
.../org/apache/nifi/processors/hive/PutHiveStreaming.java | 2 ++
.../java/org/apache/nifi/util/hive/HiveConfigurator.java | 9 +++++++++
.../nifi-hive-processors/src/test/resources/hive-site.xml | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/e969a5ff/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
index 84eda83..e53ddc9 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java
@@ -323,6 +323,8 @@ public class PutHiveStreaming extends AbstractProcessor {
.withMaxOpenConnections(maxConnections)
.withHeartBeatInterval(heartbeatInterval);
+ hiveConfigurator.preload(hiveConfig);
+
if (SecurityUtil.isSecurityEnabled(hiveConfig)) {
final String principal = context.getProperty(kerberosProperties.getKerberosPrincipal()).getValue();
final String keyTab = context.getProperty(kerberosProperties.getKerberosKeytab()).getValue();
http://git-wip-us.apache.org/repos/asf/nifi/blob/e969a5ff/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveConfigurator.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveConfigurator.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveConfigurator.java
index 748847d..ad22177 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveConfigurator.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveConfigurator.java
@@ -18,6 +18,7 @@ package org.apache.nifi.util.hive;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.security.UserGroupInformation;
@@ -71,6 +72,14 @@ public class HiveConfigurator {
return hiveConfig;
}
+ public void preload(Configuration configuration) {
+ try {
+ FileSystem.get(configuration);
+ } catch (IOException ioe) {
+ // Suppress exception as future uses of this configuration will fail
+ }
+ }
+
public UserGroupInformation authenticate(final Configuration hiveConfig, String principal, String keyTab, long ticketRenewalPeriod, ComponentLog log) throws AuthenticationFailedException {
UserGroupInformation ugi;
http://git-wip-us.apache.org/repos/asf/nifi/blob/e969a5ff/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/resources/hive-site.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/resources/hive-site.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/resources/hive-site.xml
index 52e32a4..7e7f86c 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/resources/hive-site.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/resources/hive-site.xml
@@ -17,6 +17,6 @@
<configuration>
<property>
<name>fs.default.name</name>
- <value>hdfs://hive</value>
+ <value>file:///</value>
</property>
</configuration>
\ No newline at end of file