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-8200: Modifying PutAzureDataLakeStorage to delete temp file if e… #4815

Closed
wants to merge 10 commits into from
Closed

NIFI-8200: Modifying PutAzureDataLakeStorage to delete temp file if e… #4815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81c2dec
NIFI-8200: Modifying PutAzureDataLakeStorage to delete temp file if e…
timeabarna Feb 10, 2021
73fba41
NIFI-8200 correcting error handling to avoid Exception supression
timeabarna Feb 15, 2021
3618842
NIFI-8200 Adding file deletion behavior to documentation
timeabarna Feb 17, 2021
94fea5d
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
472a228
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
46aa098
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
24badb4
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
4ccef0b
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
2a169e3
Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…
timeabarna Feb 19, 2021
e81ab3a
NIFI-8200 Adding trailing newline at the end of file.
timeabarna Feb 19, 2021
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
3 changes: 3 additions & 0 deletions ...ssors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
if (length > 0) {
try (final InputStream rawIn = session.read(flowFile); final BufferedInputStream bufferedIn = new BufferedInputStream(rawIn)) {
uploadContent(fileClient, bufferedIn, length);
} catch (Exception e) {
fileClient.delete();
throw e;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exception e is suppressed if fileClient.delete() also throws an exception. My recommendation is to put a try-catch-finally around delete(). In the catch only an error message needs to be logged, and in the finally the original exception 'e' can be thrown forward.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your help, corrected in the next commit

}
}

Expand Down
17 changes: 17 additions & 0 deletions ...ors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.junit.Ignore;
import org.junit.Test;

import java.io.InputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -43,6 +44,11 @@
import static org.apache.nifi.processors.azure.storage.utils.ADLSAttributes.ATTR_NAME_PRIMARY_URI;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

public class ITPutAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {

Expand Down Expand Up @@ -241,6 +247,17 @@ public void testPutFileWithELButFileNameIsNotSpecified() {
assertFailure();
}

@Test(expected = NullPointerException.class)
public void testPutFileButFailedToAppend() {
DataLakeFileClient fileClient = mock(DataLakeFileClient.class);
InputStream stream = mock(InputStream.class);
doThrow(NullPointerException.class).when(fileClient).append(any(InputStream.class), anyLong(), anyLong());

PutAzureDataLakeStorage.uploadContent(fileClient, stream, FILE_DATA.length);

verify(fileClient).delete();
}

private Map<String, String> createAttributesMap() {
Map<String, String> attributes = new HashMap<>();

Expand Down