Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-14 05:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-13666 Applied the change to 1.X

Browse Source 
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #9190
This commit is contained in:
Mike Thomsen 2024-08-21 08:16:04 -04:00 committed by Matt Burgess
parent 336055e3bf
commit 1f3b49b02b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
View File

@ -134,7 +134,7 @@ public class CopyS3Object extends AbstractS3Processor {
s3.copyObject(request);
session.getProvenanceReporter().send(flowFile, getTransitUrl(destinationBucket, destinationKey));
session.transfer(flowFile, REL_SUCCESS);
} catch (final AmazonClientException e) {
} catch (final IllegalArgumentException | AmazonClientException e) {
flowFile = extractExceptionDetails(e, session, flowFile);
getLogger().error("Failed to copy S3 object from Bucket [{}] Key [{}]", sourceBucket, sourceKey, e);
session.transfer(flowFile, REL_FAILURE);

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
View File

@ -128,7 +128,7 @@ public class DeleteS3Object extends AbstractS3Processor {
final DeleteVersionRequest r = new DeleteVersionRequest(bucket, key, versionId);
s3.deleteVersion(r);
}
} catch (final AmazonServiceException ase) {
} catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to delete S3 Object for {}; routing to failure", flowFile, ase);
flowFile = session.penalize(flowFile);

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
View File

@ -286,7 +286,7 @@ public class FetchS3Object extends AbstractS3Processor {
if (metadata.getVersionId() != null) {
attributes.put("s3.version", metadata.getVersionId());
}
} catch (final IOException | AmazonClientException ioe) {
} catch (final IllegalArgumentException | IOException | AmazonClientException ioe) {
flowFile = extractExceptionDetails(ioe, session, flowFile);
getLogger().error("Failed to retrieve S3 Object for {}; routing to failure", flowFile, ioe);
flowFile = session.penalize(flowFile);

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
View File

@ -207,7 +207,7 @@ public class GetS3ObjectMetadata extends AbstractS3Processor {
}
session.transfer(flowFile, relationship);
} catch (final AmazonClientException e) {
} catch (final IllegalArgumentException | AmazonClientException e) {
getLogger().error("Failed to get S3 Object Metadata from Bucket [{}] Key [{}]", bucket, key, e);
flowFile = extractExceptionDetails(e, session, flowFile);
session.transfer(flowFile, REL_FAILURE);

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
View File

@ -868,7 +868,7 @@ public class PutS3Object extends AbstractS3Processor {
} catch (IOException e) {
getLogger().info("Error trying to delete key {} from cache", cacheKey, e);
}
} catch (final ProcessException | AmazonClientException pe) {
} catch (final IllegalArgumentException | ProcessException | AmazonClientException pe) {
extractExceptionDetails(pe, session, flowFile);
if (pe.getMessage().contains(S3_PROCESS_UNSCHEDULED_MESSAGE)) {
getLogger().info(pe.getMessage());

2
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
View File

@ -203,7 +203,7 @@ public class TagS3Object extends AbstractS3Processor {
r = new SetObjectTaggingRequest(bucket, key, version, new ObjectTagging(tags));
}
s3.setObjectTagging(r);
} catch (final AmazonServiceException ase) {
} catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to tag S3 Object for {}; routing to failure", flowFile, ase);
flowFile = session.penalize(flowFile);