nifi git commit: Remove repo cleanup in favor of delegation to JUnit TemporaryFolder.
Repository: nifi Updated Branches: refs/heads/appveyor-improvement e13081a85 -> cde49cc6f Remove repo cleanup in favor of delegation to JUnit TemporaryFolder. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cde49cc6 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cde49cc6 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cde49cc6 Branch: refs/heads/appveyor-improvement Commit: cde49cc6f82b6495657f1c3e81c47e49d33507ec Parents: e13081a Author: Aldrin PiriAuthored: Fri Oct 14 13:37:26 2016 -0400 Committer: Aldrin Piri Committed: Fri Oct 14 13:37:26 2016 -0400 -- .../TestPersistentProvenanceRepository.java | 24 1 file changed, 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/cde49cc6/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java -- diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java index 4a0cd84..0fcbacd 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java @@ -146,30 +146,6 @@ public class TestPersistentProvenanceRepository { } catch (final IOException ioe) { } } - -// Delete all of the storage files. We do this in order to clean up the tons of files that -// we create but also to ensure that we have closed all of the file handles. If we leave any -// streams open, for instance, this will throw an IOException, causing our unit test to fail. -for (final File storageDir : config.getStorageDirectories()) { -int i; -for (i = 0; i < 3; i++) { -try { -FileUtils.deleteFile(storageDir, true); -break; -} catch (final IOException ioe) { -// if there is a virus scanner, etc. running in the background we may not be able to -// delete the file. Wait a sec and try again. -if (i == 2) { -throw ioe; -} else { -try { -Thread.sleep(1000L); -} catch (final InterruptedException ie) { -} -} -} -} -} }
nifi git commit: NIFI-2894: Fixed typo in PutSQL documentation
Repository: nifi Updated Branches: refs/heads/master d63e675a7 -> 596b98865 NIFI-2894: Fixed typo in PutSQL documentation This closes #1129 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/596b9886 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/596b9886 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/596b9886 Branch: refs/heads/master Commit: 596b98865b1c3526072ea120f86f0ff9627f82a8 Parents: d63e675 Author: Matt BurgessAuthored: Thu Oct 13 09:19:08 2016 -0400 Committer: Oleg Zhurakousky Committed: Fri Oct 14 12:45:34 2016 -0400 -- .../src/main/java/org/apache/nifi/processors/standard/PutSQL.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/596b9886/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java -- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java index eb27d40..adfac05 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java @@ -116,7 +116,7 @@ public class PutSQL extends AbstractProcessor { static final PropertyDescriptor SUPPORT_TRANSACTIONS = new PropertyDescriptor.Builder() .name("Support Fragmented Transactions") .description("If true, when a FlowFile is consumed by this Processor, the Processor will first check the fragment.identifier and fragment.count attributes of that FlowFile. " -+ "If the fragment.count value is greater than 1, the Processor will not process any FlowFile will that fragment.identifier until all are available; " ++ "If the fragment.count value is greater than 1, the Processor will not process any FlowFile with that fragment.identifier until all are available; " + "at that point, it will process all FlowFiles with that fragment.identifier as a single transaction, in the order specified by the FlowFiles' fragment.index attributes. " + "This Provides atomicity of those SQL statements. If this value is false, these attributes will be ignored and the updates will occur independent of one another.") .allowableValues("true", "false")
nifi git commit: NIFI-2901: Comment out hadoop.version overrides for vendor profiles
Repository: nifi Updated Branches: refs/heads/master b52b83989 -> d63e675a7 NIFI-2901: Comment out hadoop.version overrides for vendor profiles This closes #1139 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d63e675a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d63e675a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d63e675a Branch: refs/heads/master Commit: d63e675a7d2905ae8408adc8114c01c2ea4604c8 Parents: b52b839 Author: Matt BurgessAuthored: Fri Oct 14 12:05:52 2016 -0400 Committer: Oleg Zhurakousky Committed: Fri Oct 14 12:40:31 2016 -0400 -- pom.xml | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/d63e675a/pom.xml -- diff --git a/pom.xml b/pom.xml index 497823b..735a9ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1869,8 +1869,9 @@ language governing permissions and limitations under the License. --> + command-line 2.7.1.2.4.0.0-169 +--> @@ -1892,8 +1893,9 @@ language governing permissions and limitations under the License. --> + command-line 2.7.0-mapr-1602 +--> @@ -1915,8 +1917,9 @@ language governing permissions and limitations under the License. --> + command-line 2.6.0-cdh5.8.1 +-->
nifi git commit: NIFI-2897: Fixed SelectHiveQL for CSV output of complex types
Repository: nifi Updated Branches: refs/heads/master 88d125137 -> b52b83989 NIFI-2897: Fixed SelectHiveQL for CSV output of complex types This closes #1132 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b52b8398 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b52b8398 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b52b8398 Branch: refs/heads/master Commit: b52b8398957dcb60b93ea5f697f45d3e0e212082 Parents: 88d1251 Author: Matt BurgessAuthored: Thu Oct 13 13:27:49 2016 -0400 Committer: Oleg Zhurakousky Committed: Fri Oct 14 12:35:38 2016 -0400 -- .../java/org/apache/nifi/util/hive/HiveJdbcCommon.java| 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/b52b8398/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java -- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java index d4b2945..689baf9 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/HiveJdbcCommon.java @@ -339,6 +339,16 @@ public class HiveJdbcCommon { rowValues.add(""); } break; +case ARRAY: +case STRUCT: +case JAVA_OBJECT: +String complexValueString = rs.getString(i); +if (complexValueString != null) { + rowValues.add(StringEscapeUtils.escapeCsv(complexValueString)); +} else { +rowValues.add(""); +} +break; default: if (value != null) { rowValues.add(value.toString());
nifi git commit: Making the TemporaryFolder public.
Repository: nifi Updated Branches: refs/heads/appveyor-improvement e3624ee56 -> e13081a85 Making the TemporaryFolder public. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e13081a8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e13081a8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e13081a8 Branch: refs/heads/appveyor-improvement Commit: e13081a85bbad64f9b4442ad58049e581862d3a6 Parents: e3624ee Author: Aldrin PiriAuthored: Fri Oct 14 12:09:31 2016 -0400 Committer: Aldrin Piri Committed: Fri Oct 14 12:09:31 2016 -0400 -- .../apache/nifi/provenance/TestPersistentProvenanceRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/e13081a8/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java -- diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java index 7c8a6dc..4a0cd84 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java @@ -99,7 +99,7 @@ public class TestPersistentProvenanceRepository { public TestName name = new TestName(); @Rule -TemporaryFolder testFolder = new TemporaryFolder(); +public TemporaryFolder testFolder = new TemporaryFolder(); private PersistentProvenanceRepository repo; private RepositoryConfiguration config;
nifi git commit: Adjusting test to use a temporary folder to alleviate Windows concerns with provenance testing.
Repository: nifi Updated Branches: refs/heads/appveyor-improvement c9fb0b142 -> e3624ee56 Adjusting test to use a temporary folder to alleviate Windows concerns with provenance testing. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e3624ee5 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e3624ee5 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e3624ee5 Branch: refs/heads/appveyor-improvement Commit: e3624ee5654a2aa7f0555901c9604833c97f2ef8 Parents: c9fb0b1 Author: Aldrin PiriAuthored: Fri Oct 14 11:09:25 2016 -0400 Committer: Aldrin Piri Committed: Fri Oct 14 11:09:25 2016 -0400 -- .../TestPersistentProvenanceRepository.java | 32 +++- 1 file changed, 17 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/e3624ee5/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java -- diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java index 80a67eb..7c8a6dc 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java @@ -85,6 +85,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.rules.TestName; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -97,6 +98,9 @@ public class TestPersistentProvenanceRepository { @Rule public TestName name = new TestName(); +@Rule +TemporaryFolder testFolder = new TemporaryFolder(); + private PersistentProvenanceRepository repo; private RepositoryConfiguration config; @@ -104,9 +108,9 @@ public class TestPersistentProvenanceRepository { private EventReporter eventReporter; private List reportedEvents = Collections.synchronizedList(new ArrayList()); -private RepositoryConfiguration createConfiguration() { +private RepositoryConfiguration createConfiguration() throws IOException { config = new RepositoryConfiguration(); -config.addStorageDirectory(new File("target/storage/" + UUID.randomUUID().toString())); +config.addStorageDirectory(testFolder.newFolder()); config.setCompressOnRollover(true); config.setMaxEventFileLife(2000L, TimeUnit.SECONDS); config.setCompressionBlockBytes(100); @@ -169,7 +173,6 @@ public class TestPersistentProvenanceRepository { } - private EventReporter getEventReporter() { return eventReporter; } @@ -360,7 +363,7 @@ public class TestPersistentProvenanceRepository { int immenseAttrSize = 33000; // must be greater than 32766 for a meaningful test StringBuilder immenseBldr = new StringBuilder(immenseAttrSize); -for (int i=0; i < immenseAttrSize; i++) { +for (int i = 0; i < immenseAttrSize; i++) { immenseBldr.append('0'); } final String uuid = "----"; @@ -1491,9 +1494,9 @@ public class TestPersistentProvenanceRepository { assertEquals(5, lineageNodes.stream().map(node -> node.getNodeType()).filter(t -> t == LineageNodeType.PROVENANCE_EVENT_NODE).count()); final Set eventNodes = lineageNodes.stream() -.filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE) -.map(node -> (EventNode) node) -.collect(Collectors.toSet()); +.filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE) +.map(node -> (EventNode) node) +.collect(Collectors.toSet()); final Map nodesByType = eventNodes.stream().collect(Collectors.groupingBy(EventNode::getEventType)); assertEquals(1, nodesByType.get(ProvenanceEventType.RECEIVE).size()); @@ -1517,9 +1520,9 @@ public class TestPersistentProvenanceRepository { assertEquals(3, expandChildNodes.stream().map(node -> node.getNodeType()).filter(t -> t ==
nifi git commit: NIFI-2199 - allows nifi.sh restart through ssh
Repository: nifi Updated Branches: refs/heads/master e969a5ffe -> 88d125137 NIFI-2199 - allows nifi.sh restart through ssh Closes: #1092 Signed-off-by: Andre F de MirandaProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/88d12513 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/88d12513 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/88d12513 Branch: refs/heads/master Commit: 88d125137e3bf3faf80b522edf5cf14f99419d60 Parents: e969a5f Author: Michal Klempa Authored: Tue Oct 4 12:18:46 2016 +0200 Committer: Andre F de Miranda Committed: Sat Oct 15 00:48:04 2016 +1100 -- .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/88d12513/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh index b58a622..79850ee 100755 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh @@ -267,7 +267,7 @@ run() { RUN_NIFI_CMD="cd "\""${NIFI_HOME}"\"" && ${sudo_cmd_prefix} "\""${JAVA}"\"" -cp "\""${BOOTSTRAP_CLASSPATH}"\"" -Xms12m -Xmx24m ${BOOTSTRAP_DIR_PARAMS} org.apache.nifi.bootstrap.RunNiFi" if [ "$1" = "start" ]; then -(eval $RUN_NIFI_CMD $@ &) +(eval $RUN_NIFI_CMD $@ &)> /dev/null 2>&1 < /dev/null else (eval $RUN_NIFI_CMD $@) fi
nifi git commit: Removing MaxPermSize option.
Repository: nifi Updated Branches: refs/heads/appveyor-improvement f6d76404f -> c9fb0b142 Removing MaxPermSize option. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c9fb0b14 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c9fb0b14 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c9fb0b14 Branch: refs/heads/appveyor-improvement Commit: c9fb0b142bf884f796120f37aa6fa7be327ab711 Parents: f6d7640 Author: Aldrin PiriAuthored: Fri Oct 14 09:39:53 2016 -0400 Committer: Aldrin Piri Committed: Fri Oct 14 09:39:53 2016 -0400 -- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/c9fb0b14/appveyor.yml -- diff --git a/appveyor.yml b/appveyor.yml index d54984f..b486557 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,8 +29,8 @@ install: } - cmd: SET M2_HOME=C:\maven\apache-maven-3.1.1 - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH%% - - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: SET MAVEN_OPTS=-Xmx4g + - cmd: SET JAVA_OPTS=-Xmx4g build_script: - mvn -q -T 2C -DskipTests clean install test_script:
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 BurgessNIFI-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 Authored: Fri Oct 7 13:27:30 2016 +1100 Committer: Matt Burgess 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 @@ fs.default.name -hdfs://hive +file:/// \ No newline at end of file
nifi git commit: Updating appveyor to mimic Travis CI build.
Repository: nifi Updated Branches: refs/heads/appveyor-improvement [created] f6d76404f Updating appveyor to mimic Travis CI build. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f6d76404 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f6d76404 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f6d76404 Branch: refs/heads/appveyor-improvement Commit: f6d76404f57dfffdd2c6c20458e7d5a6a2904d11 Parents: 7107616 Author: Aldrin PiriAuthored: Fri Oct 14 09:22:06 2016 -0400 Committer: Aldrin Piri Committed: Fri Oct 14 09:22:06 2016 -0400 -- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/f6d76404/appveyor.yml -- diff --git a/appveyor.yml b/appveyor.yml index c7aa2f2..d54984f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,9 +32,9 @@ install: - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g build_script: - - mvn -q clean package --batch-mode -DskipTests + - mvn -q -T 2C -DskipTests clean install test_script: - - mvn -q clean install --batch-mode -Pcontrib-check + - mvn -P contrib-check verify cache: - C:\maven\ - C:\Users\appveyor\.m2