Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP #8390

Closed
wants to merge 2 commits into from
Closed

NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP #8390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304d2b6
NIFI-12772 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP
tombrisland Feb 9, 2024
b883633
revert max results optimisation + unnecessary import
tombrisland Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions ...transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/ListFileTransfer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -124,13 +123,7 @@ protected List<FileInfo> performListing(final ProcessContext context, final Long
return listing;
}

final Iterator<FileInfo> itr = listing.iterator();
while (itr.hasNext()) {
final FileInfo next = itr.next();
if (next.getLastModifiedTime() < minTimestamp) {
itr.remove();
}
}
listing.removeIf(file -> file.getLastModifiedTime() < minTimestamp);

return listing;
}
Expand Down
3 changes: 2 additions & 1 deletion .../nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
properties.add(SFTPTransfer.FILE_FILTER_REGEX);
properties.add(SFTPTransfer.PATH_FILTER_REGEX);
properties.add(SFTPTransfer.IGNORE_DOTTED_FILES);
properties.add(SFTPTransfer.REMOTE_POLL_BATCH_SIZE);
properties.add(SFTPTransfer.STRICT_HOST_KEY_CHECKING);
properties.add(SFTPTransfer.HOST_KEY_FILE);
properties.add(SFTPTransfer.CONNECTION_TIMEOUT);
Expand Down Expand Up @@ -176,7 +177,7 @@ private Predicate<FileInfo> createFileFilter(final ProcessContext context) {
final Long maxAge = context.getProperty(ListFile.MAX_AGE).asTimePeriod(TimeUnit.MILLISECONDS);

return (attributes) -> {
if(attributes.isDirectory()) {
if (attributes.isDirectory()) {
return true;
}

Expand Down
37 changes: 26 additions & 11 deletions ...i-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
*/
package org.apache.nifi.processors.standard;

import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
Expand All @@ -45,6 +35,16 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;

public class TestListSFTP {
Expand Down Expand Up @@ -94,7 +94,7 @@ public void testRunFileFound() {
runner.assertAllFlowFilesContainAttribute(ListFile.FILE_PERMISSIONS_ATTRIBUTE);
runner.assertAllFlowFilesContainAttribute(ListFile.FILE_SIZE_ATTRIBUTE);
runner.assertAllFlowFilesContainAttribute(ListFile.FILE_LAST_MODIFY_TIME_ATTRIBUTE);
runner.assertAllFlowFilesContainAttribute( "filename");
runner.assertAllFlowFilesContainAttribute("filename");

final MockFlowFile retrievedFile = runner.getFlowFilesForRelationship(ListSFTP.REL_SUCCESS).get(0);
retrievedFile.assertAttributeEquals("sftp.listing.user", sshServer.getUsername());
Expand Down Expand Up @@ -178,6 +178,21 @@ public void testRunFileNotFoundMinSizeFiltered() {
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 0);
}

@Test
public void testRemotePollBatchSizeEnforced() {
runner.setProperty(AbstractListProcessor.LISTING_STRATEGY, AbstractListProcessor.NO_TRACKING);
runner.setProperty(SFTPTransfer.REMOTE_POLL_BATCH_SIZE, "1");

runner.run();
// Of 3 items only 1 returned due to batch size
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);

runner.setProperty(SFTPTransfer.REMOTE_POLL_BATCH_SIZE, "2");

runner.run();
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 3);
}

@Test
public void testVerificationSuccessful() {
final List<ConfigVerificationResult> results = ((VerifiableProcessor) runner.getProcessor())
Expand Down