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

timeabarna · 2021-02-10T14:07:06Z

…xception was thrown in uploadContent()

https://issues.apache.org/jira/browse/NIFI-8200

Description of PR

delete temp file if exception was thrown in uploadContent()

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically main)?
Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
Have you written or updated unit tests to verify your changes?
Have you verified that the full build is successful on JDK 8?
Have you verified that the full build is successful on JDK 11?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.

…xception was thrown in uploadContent()

pgyori

Thank you for the fix! I tested it with interrupting internet access while uploading a large file. I found one case that I think needs to be handled, please check my comment with a proposed solution.

pgyori · 2021-02-10T17:47:00Z

...ocessors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java

@@ -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;


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.

Thanks for your help, corrected in the next commit

pgyori

Thank you!
LGTM

jfrazee · 2021-02-15T20:58:18Z

@timeabarna What happens when an existing file is being overwritten with the Conflict Resolution Strategy set to replace?

timeabarna · 2021-02-16T15:10:59Z

@timeabarna What happens when an existing file is being overwritten with the Conflict Resolution Strategy set to replace?

@jfrazee Thanks for pointing this out. I've checked the original version and the behaviour is the following:

The original file has been replaced with a 0 byte file
uploading content started
if uploading failed the original data was gone and the 0 byte file remained

With this current modification the behaviour:

file replaced with a 0 byte file
uploading content started
if failed the 0 byte file was removed (if deletion fails, the 0 byte file remains)

I'm exploring the possibility using temp files instead of inline replacement however I think this should be covered by another Jira ticket.

jfrazee · 2021-02-16T15:51:24Z

@timeabarna That's what I figured. It's not ideal, but this isn't a regression. Can we clarify the delete behavior in the docs?

jfrazee · 2021-02-16T16:00:25Z

@timeabarna Oh, also, yes it makes sense to have another JIRA for some more sophisticated handling, which should probably be done. Ideally we should try to have the same behavior we can get with HDFS, which I think is achievable since renames are atomic.

timeabarna · 2021-02-17T06:37:23Z

@timeabarna That's what I figured. It's not ideal, but this isn't a regression. Can we clarify the delete behavior in the docs?

@jfrazee Sure thing, will update the docs accordingly

...docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html

jfrazee · 2021-02-18T17:59:15Z

...docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html

+</ul>
+
+</body>
+</html>


Can you add a trailing newline?

All suggestions have been applied. Thanks Joey for your help.

...docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

jfrazee · 2021-02-21T21:26:23Z

Thanks for this @timeabarna +1

…eption was thrown in uploadContent() This closes #4815 Signed-off-by: Joey Frazee <jfrazee@apache.org>

…eption was thrown in uploadContent() This closes apache#4815 Signed-off-by: Joey Frazee <jfrazee@apache.org>

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

81c2dec

…xception was thrown in uploadContent()

timeabarna force-pushed the NIFI-8200 branch from e0c8e49 to 81c2dec Compare February 10, 2021 14:12

pgyori requested changes Feb 10, 2021

View reviewed changes

NIFI-8200 correcting error handling to avoid Exception supression

73fba41

pgyori approved these changes Feb 15, 2021

View reviewed changes

NIFI-8200 Adding file deletion behavior to documentation

3618842

jfrazee requested changes Feb 18, 2021

View reviewed changes

timeabarna and others added 7 commits February 19, 2021 07:48

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

94fea5d

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

472a228

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

46aa098

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

24badb4

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

4ccef0b

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

Update nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/m…

2a169e3

…ain/resources/docs/org.apache.nifi.processors.azure.storage.PutAzureDataLakeStorage/additionalDetails.html Co-authored-by: Joey <joey.frazee@icloud.com>

NIFI-8200 Adding trailing newline at the end of file.

e81ab3a

jfrazee approved these changes Feb 21, 2021

View reviewed changes

jfrazee closed this in 59ad21f Feb 21, 2021

asfgit pushed a commit that referenced this pull request Feb 25, 2021

NIFI-8200 Modified PutAzureDataLakeStorage to delete temp file if exc…

e57bc69

…eption was thrown in uploadContent() This closes #4815 Signed-off-by: Joey Frazee <jfrazee@apache.org>

driesva pushed a commit to driesva/nifi that referenced this pull request Mar 19, 2021

NIFI-8200 Modified PutAzureDataLakeStorage to delete temp file if exc…

5bb8d24

…eption was thrown in uploadContent() This closes apache#4815 Signed-off-by: Joey Frazee <jfrazee@apache.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

timeabarna commented Feb 10, 2021 •

edited

pgyori left a comment

pgyori Feb 10, 2021

timeabarna Feb 15, 2021

pgyori left a comment

jfrazee commented Feb 15, 2021

timeabarna commented Feb 16, 2021

jfrazee commented Feb 16, 2021

jfrazee commented Feb 16, 2021

timeabarna commented Feb 17, 2021

jfrazee Feb 18, 2021

timeabarna Feb 19, 2021

jfrazee commented Feb 21, 2021

+              </ul>
+              </body>
+              </html>

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

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

Conversation

timeabarna commented Feb 10, 2021 • edited

Description of PR

For all changes:

For code changes:

For documentation related changes:

Note:

pgyori left a comment

Choose a reason for hiding this comment

pgyori Feb 10, 2021

Choose a reason for hiding this comment

timeabarna Feb 15, 2021

Choose a reason for hiding this comment

pgyori left a comment

Choose a reason for hiding this comment

jfrazee commented Feb 15, 2021

timeabarna commented Feb 16, 2021

jfrazee commented Feb 16, 2021

jfrazee commented Feb 16, 2021

timeabarna commented Feb 17, 2021

jfrazee Feb 18, 2021

Choose a reason for hiding this comment

timeabarna Feb 19, 2021

Choose a reason for hiding this comment

jfrazee commented Feb 21, 2021

timeabarna commented Feb 10, 2021 •

edited