You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2019/02/15 19:12:11 UTC
[nifi] branch master updated: NIFI-6023: Deprecated the
"Distributed Cache Service" property in ListHDFS Updated exception message
thrown when accessing the ListHDFS state to refer to the State Manager
rather than the "Distributed Cache Service" Removed usage and references to
MockCacheClient from TestListHDFS
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new b7ca59f NIFI-6023: Deprecated the "Distributed Cache Service" property in ListHDFS Updated exception message thrown when accessing the ListHDFS state to refer to the State Manager rather than the "Distributed Cache Service" Removed usage and references to MockCacheClient from TestListHDFS
b7ca59f is described below
commit b7ca59f568a71ba476cdee95348b8ce3edd381f4
Author: Jeff Storck <jt...@gmail.com>
AuthorDate: Fri Feb 15 13:30:47 2019 -0500
NIFI-6023: Deprecated the "Distributed Cache Service" property in ListHDFS
Updated exception message thrown when accessing the ListHDFS state to refer to the State Manager rather than the "Distributed Cache Service"
Removed usage and references to MockCacheClient from TestListHDFS
NIFI-6023: Minor update of the "Distributed Cache Service" description
This closes #3313.
Signed-off-by: Bryan Bende <bb...@apache.org>
---
.../main/java/org/apache/nifi/processors/hadoop/ListHDFS.java | 6 +++---
.../java/org/apache/nifi/processors/hadoop/TestListHDFS.java | 10 ----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
index a147730..27f58ef 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
@@ -96,10 +96,10 @@ import java.util.regex.Pattern;
@SeeAlso({GetHDFS.class, FetchHDFS.class, PutHDFS.class})
public class ListHDFS extends AbstractHadoopProcessor {
+ @Deprecated
public static final PropertyDescriptor DISTRIBUTED_CACHE_SERVICE = new PropertyDescriptor.Builder()
.name("Distributed Cache Service")
- .description("Specifies the Controller Service that should be used to maintain state about what has been pulled from HDFS so that if a new node "
- + "begins pulling data, it won't duplicate all of the work that has been done.")
+ .description("This property is ignored. State will be stored in the " + Scope.LOCAL + " or " + Scope.CLUSTER + " scope by the State Manager based on NiFi's configuration.")
.required(false)
.identifiesControllerService(DistributedMapCacheClient.class)
.build();
@@ -363,7 +363,7 @@ public class ListHDFS extends AbstractHadoopProcessor {
}
}
} catch (final IOException ioe) {
- getLogger().error("Failed to retrieve timestamp of last listing from Distributed Cache Service. Will not perform listing until this is accomplished.");
+ getLogger().error("Failed to retrieve timestamp of last listing from the State Manager. Will not perform listing until this is accomplished.");
context.yield();
return;
}
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
index b349962..8134b4d 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
@@ -66,7 +66,6 @@ public class TestListHDFS {
private TestRunner runner;
private ListHDFSWithMockedFileSystem proc;
- private MockCacheClient service;
private NiFiProperties mockNiFiProperties;
private KerberosProperties kerberosProperties;
@@ -79,13 +78,8 @@ public class TestListHDFS {
proc = new ListHDFSWithMockedFileSystem(kerberosProperties);
runner = TestRunners.newTestRunner(proc);
- service = new MockCacheClient();
- runner.addControllerService("service", service);
- runner.enableControllerService(service);
-
runner.setProperty(ListHDFS.HADOOP_CONFIGURATION_RESOURCES, "src/test/resources/core-site.xml");
runner.setProperty(ListHDFS.DIRECTORY, "/test");
- runner.setProperty(ListHDFS.DISTRIBUTED_CACHE_SERVICE, "service");
}
@Test
@@ -374,9 +368,6 @@ public class TestListHDFS {
// add new file to pull
proc.fileSystem.addFileStatus(new Path("/test"), new FileStatus(1L, false, 1, 1L, 2000L, 0L, create777(), "owner", "group", new Path("/test/testFile2.txt")));
- // cause calls to service to fail
- service.failOnCalls = true;
-
runner.getStateManager().setFailOnStateGet(Scope.CLUSTER, true);
// Should fail to perform @OnScheduled methods.
@@ -397,7 +388,6 @@ public class TestListHDFS {
runner.assertAllFlowFilesTransferred(ListHDFS.REL_SUCCESS, 0);
- service.failOnCalls = false;
runner.getStateManager().setFailOnStateGet(Scope.CLUSTER, false);
Thread.sleep(TimeUnit.NANOSECONDS.toMillis(2 * ListHDFS.LISTING_LAG_NANOS));